From 336fda7cecd67607046df01c7c6aa6f73fc97ac2 Mon Sep 17 00:00:00 2001
From: Technus <daniel112092@gmail.com>
Date: Fri, 1 Nov 2019 13:40:37 +0100
Subject: TEMP WORK

---
 .../tectech/mechanics/anomaly/AnomalyHandler.java  | 45 ++++++++++++++++++----
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index 2a770ea332..ad80c40be2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -33,13 +33,17 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     public static final double SWAP_THRESHOLD = dAtomDefinition.getSomethingHeavy().getMass() * 10000D;
     public static final int COUNT_DIV=32;
     public static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
-    public static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
+    public static final String INTENSITY = "intensity";
+    public static final String SPACE_CANCER="space_cancer";
+    public static final String SPACE_CHARGE ="space_charge";
+    public static final double GRAVITY_EFFECTIVENESS =1;
+    public static final String SPACE_MASS ="space_mass";
     public static final int MEAN_DELAY =50;
     private static final float CHARGE_EFFECTIVENESS = 10;
     private static final float CHARGE_EXPLOSIVENESS = 5;
 
     private boolean fixMe=false;
-    private final ArrayList<EntityPlayer> playersWithCharge = new ArrayList<>();
+    private final List<EntityPlayer> playersWithCharge = new ArrayList<>();
     private final ArrayList<Chunk> worldDataArrayList = new ArrayList<>(512);
 
     @Override
@@ -94,16 +98,16 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         if (playersWithCharge.size() > 0) {
             outer:
             for (EntityPlayer other : playersWithCharge) {
-                float fieldOther = TecTech.playerPersistence.getDataOrSetToNewTag(other).getFloat(SPACE_CHARGE);
+                float chargeOther = TecTech.playerPersistence.getDataOrSetToNewTag(other).getFloat(SPACE_CHARGE);
                 for (EntityPlayer player : playersWithCharge) {
                     if (other == player) {
                         continue outer;
                     }
-                    float field = TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE);
-                    float difference = Math.abs(field - fieldOther);
+                    float charge = TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE);
+                    float difference = Math.abs(charge - chargeOther);
                     if (difference != 0) {
                         if (player.getDistanceSqToEntity(other) < 1) {
-                            float avg = (fieldOther + field) / 2;
+                            float avg = (chargeOther + charge) / 2;
                             addAnomaly(other.worldObj.provider.dimensionId, new ChunkCoordIntPair(other.chunkCoordX, other.chunkCoordZ), Math.min(SWAP_THRESHOLD, PER_PARTICLE * difference));
                             other.worldObj.createExplosion(other, other.posX, other.posY, other.posZ, Math.min(CHARGE_EXPLOSIVENESS * difference, 25), true);
                             player.worldObj.createExplosion(player, player.posX, player.posY, player.posZ, Math.min(CHARGE_EXPLOSIVENESS * difference, 25), true);
@@ -287,13 +291,40 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                                         double dY = player.posY - otherPlayer.posY;
                                         double dZ = player.posZ - otherPlayer.posZ;
                                         player.addVelocity(effect * dX, effect * dY, effect * dZ);
-                                        otherPlayer.addVelocity(-effect * dX, -effect * dY, -effect * dZ);
+                                        effect=-effect;
+                                        otherPlayer.addVelocity(effect * dX, effect * dY, effect * dZ);
                                     }
                                 }
                             }
                         }
                     }
                 }
+
+                float mass=TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_MASS);
+                if(mass!=0) {
+                    for (Object o : player.worldObj.playerEntities) {
+                        if (o instanceof EntityPlayer && !((EntityPlayer) o).capabilities.isCreativeMode) {
+                            EntityPlayer otherPlayer=(EntityPlayer)o;
+                            float massOther = TecTech.playerPersistence.getDataOrSetToNewTag(otherPlayer).getFloat(SPACE_MASS);
+                            if (massOther != 0 && player != o) {
+                                float reaction = massOther * mass;
+                                if (reaction !=0) {
+                                    double distanceSq = otherPlayer.getDistanceSqToEntity(player);
+                                    if (distanceSq >= 1) {
+                                        double effect = GRAVITY_EFFECTIVENESS * reaction / (distanceSq * distanceSq * distanceSq);
+                                        double dX = player.posX - otherPlayer.posX;
+                                        double dY = player.posY - otherPlayer.posY;
+                                        double dZ = player.posZ - otherPlayer.posZ;
+                                        otherPlayer.addVelocity(effect * dX, effect * dY, effect * dZ);
+                                        effect=-effect;
+                                        player.addVelocity(effect * dX, effect * dY, effect * dZ);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                }
             }
             if (fixMe){
                 player.setInvisible(false);
-- 
cgit 


From 8b81ea9fd4b9446bea8f95fbcb04e550ebf23c83 Mon Sep 17 00:00:00 2001
From: "[Kiwi233]" <[huaxia0611@qq.com]>
Date: Mon, 2 Aug 2021 20:57:25 +0800
Subject: Update zh_CN.lang

---
 src/main/resources/assets/tectech/lang/zh_CN.lang | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang
index c01c8f2757..56cecd80c2 100644
--- a/src/main/resources/assets/tectech/lang/zh_CN.lang
+++ b/src/main/resources/assets/tectech/lang/zh_CN.lang
@@ -87,6 +87,16 @@ item.tm.teslaCover.desc.4=到底谁在用电缆?
 item.tm.teslaStaff.name=特斯拉权杖
 item.tm.teslaStaff.desc=狂妄之人窃取了众神的权柄!
 
+item.tm.enderfluidlinkcover.name=末影流体覆盖板
+item.tm.enderfluidlinkcover.desc.0=在机器间无线传输流体!
+item.tm.enderfluidlinkcover.desc.1=可贴在储罐/机器/管道的任意面以将其与末影相连
+item.tm.enderfluidlinkcover.desc.2=末影储罐太逊了! -来自Chads-of-NH的Bot
+
+item.tm.powerpassupgradecover.name=导能升级覆盖板
+item.tm.powerpassupgradecover.desc.0=为TecTech多方块机器添加导能功能
+item.tm.powerpassupgradecover.desc.1=罐中的有源变压器??
+item.tm.powerpassupgradecover.desc.2=将它们像圣诞彩灯一样串起来!
+
 #Death Messages
 death.attack.microwaving=%1$s被辐射脱水。
 death.attack.microwaving.player=%1$s在与%2$s的战斗中被辐射脱水。
@@ -771,7 +781,7 @@ gt.blockmachines.debug.tt.data.desc.0=量子数据输出
 gt.blockmachines.debug.tt.data.desc.1=高速光纤接口
 gt.blockmachines.debug.tt.data.desc.2=启用前必须涂色
 gt.blockmachines.debug.tt.maintenance.name=Debug维护仓
-gt.blockmachines.debug.tt.maintenance.desc.0=用于维护多方块
+gt.blockmachines.debug.tt.maintenance.desc.0=自动维护多方块机器
 gt.blockmachines.debug.tt.maintenance.desc.1=它能修好一切，除了自己.
 gt.blockmachines.debug.tt.maintenance.desc.2=为人民服务!
 gt.blockmachines.debug.tt.genny.name=Debug发电机
-- 
cgit 


From bcb77f76e6e9f60f4d60e8902badd6f5618439d8 Mon Sep 17 00:00:00 2001
From: basdxz <tudurap.com@gmail.com>
Date: Thu, 26 Aug 2021 21:23:32 +0100
Subject: Make JitPack Deps Changing

---
 build.gradle.kts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 04935c1158..7ceddabf2d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,9 @@ buildscript {
         maven("https://jitpack.io")
     }
     dependencies {
-        classpath("com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT")
+        classpath("com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT"){
+            isChanging = true
+        }
     }
 }
 
@@ -170,6 +172,7 @@ dependencies {
     compile("net.industrial-craft:industrialcraft-2:$ic2Version:dev")
     compile("com.github.GTNewHorizons:GT5-Unofficial:$gt5uVersion:dev"){
         exclude("net.industrial-craft", "industrialcraft-2")
+        isChanging = true
     }
     compile("eu.usrv:YAMCore:$yamcoreVersion:deobf")
 
-- 
cgit 


From 0eb66a83720393a0ee6fda3417d122d3fbd4b6fd Mon Sep 17 00:00:00 2001
From: basdxz <tudurap.com@gmail.com>
Date: Thu, 26 Aug 2021 21:39:13 +0100
Subject: Make JitPack Deps Update Quickly

---
 build.gradle.kts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7ceddabf2d..bf388c9e64 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -199,8 +199,15 @@ dependencies {
     //    exclude("com.enderio.core", "EnderCore")
     //    exclude("mcp.mobius.waila", "Waila")
     //}
+
+    configurations.all {
+        resolutionStrategy.cacheDynamicVersionsFor(30, "seconds")
+    }
 }
 
+
+
+
 tasks.withType<Jar> {
     //Mark as outdated if versions change
     this.inputs.properties += "version" to project.version
-- 
cgit 


From dd9b39c21339b591724a44c68c8b0c68fe1cafbe Mon Sep 17 00:00:00 2001
From: Matt <mtthw8198@gmail.com>
Date: Fri, 10 Sep 2021 13:17:08 -0700
Subject: tesla tower will accept any frame again

---
 .../thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index cbc20143b3..0778feb1fd 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -46,7 +46,8 @@ import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBloc
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.util.GT_StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static java.lang.Math.min;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -102,6 +103,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.0"),//1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing
+            translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.1"),//2 - Titanium Frames
     };
 
     private static final IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> STRUCTURE_DEFINITION =
@@ -130,7 +132,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
             .addElement('C', ofBlock(sBlockCasingsBA0, 8))
             .addElement('D', defer(t -> ofBlock(sBlockCasingsBA0, t.getCoilWindingMeta())))
             .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_TM_teslaCoil::addCapacitorToMachineList, textureOffset + 16 + 6, 1, sBlockCasingsBA0, 6))
-            .addElement('F', ofFrame(Materials.get("Titanium")))
+            .addElement('F', ofHatchAdder(GT_MetaTileEntity_TM_teslaCoil::addFrameToMachineList, 0, 2))
             .build();
 
     public int getCoilWindingMeta() {
-- 
cgit 


From 08b8723025ea530d929cfad738e659b13d7f2f91 Mon Sep 17 00:00:00 2001
From: Matt <mtthw8198@gmail.com>
Date: Fri, 10 Sep 2021 13:24:55 -0700
Subject: updated adders method

---
 .../java/com/github/technus/tectech/mechanics/structure/Structure.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java b/src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java
index b37ae0bbda..44cad98791 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java
@@ -22,7 +22,7 @@ public class Structure {
 
     @Deprecated
     @SafeVarargs
-    public static <T> IHatchAdder<T>[] adders(IHatchAdder<T>... iHatchAdder) {
+    public static <T> IGT_HatchAdder<T>[] adders(IGT_HatchAdder<T>... iHatchAdder) {
         return iHatchAdder;
     }
 
-- 
cgit 


From ebd719987402bb4a60bf01a10f5b8e1480184f69 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 5 Dec 2021 09:03:50 +0100
Subject: Fix Junctions

---
 .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index b63079d2dc..29ba91d4b7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -69,7 +69,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                 v = (int) v;
                 if (v < 0) return STATUS_TOO_LOW;
                 if (v == 0) return STATUS_NEUTRAL;
-                if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH;
+                if (v > base.eOutputHatches.size()) return STATUS_TOO_HIGH;
                 return STATUS_OK;
             };
     private static final IStatusFunction<GT_MetaTileEntity_EM_junction> DST_STATUS =
@@ -80,7 +80,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                     v = (int) v;
                     if (v < 0) return STATUS_TOO_LOW;
                     if (v == 0) return STATUS_LOW;
-                    if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH;
+                    if (v > base.eInputHatches.size()) return STATUS_TOO_HIGH;
                     return STATUS_OK;
                 }
                 return STATUS_NEUTRAL;
-- 
cgit 


From 062fb04b02b9291741fdc4e79441e07cedee8796 Mon Sep 17 00:00:00 2001
From: Bass <tudurap.com@gmail.com>
Date: Fri, 24 Dec 2021 18:49:07 +0000
Subject: Merge pull request #19 from GTNewHorizons/unified-build-script

GTNewHorizons/TecTech/pull/19 Update buildscript

Unify build script
---
 .github/scripts/test-no-error-reports.sh           |  27 +
 .github/workflows/build-and-test.yml               |  45 ++
 .github/workflows/release-tags.yml                 |  61 +++
 .gitignore                                         |  62 +--
 .gitmodules                                        |   3 -
 build.gradle                                       | 562 +++++++++++++++++++++
 build.gradle.kts                                   | 292 -----------
 dependencies.gradle                                |  43 ++
 .../OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar | Bin 0 -> 988221 bytes
 draw_io_graph.png                                  | Bin 0 -> 113460 bytes
 gradle.properties                                  |  70 ++-
 gradle/wrapper/gradle-wrapper.jar                  | Bin 54417 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties           |   2 +-
 gradlew                                            |  22 +-
 gradlew.bat                                        |  18 +-
 jitpack.yml                                        |   2 +
 libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar            | Bin 1213993 -> 0 bytes
 libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar      | Bin 4458558 -> 0 bytes
 .../OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar | Bin 988221 -> 0 bytes
 real.gradle.properties                             |  20 -
 repositories.gradle                                |  26 +
 src/main/resources/mcmod.info                      |   8 +-
 22 files changed, 894 insertions(+), 369 deletions(-)
 create mode 100644 .github/scripts/test-no-error-reports.sh
 create mode 100644 .github/workflows/build-and-test.yml
 create mode 100644 .github/workflows/release-tags.yml
 delete mode 100644 .gitmodules
 create mode 100644 build.gradle
 delete mode 100644 build.gradle.kts
 create mode 100644 dependencies.gradle
 create mode 100644 dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
 create mode 100644 draw_io_graph.png
 create mode 100644 jitpack.yml
 delete mode 100644 libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar
 delete mode 100644 libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar
 delete mode 100644 libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
 delete mode 100644 real.gradle.properties
 create mode 100644 repositories.gradle

diff --git a/.github/scripts/test-no-error-reports.sh b/.github/scripts/test-no-error-reports.sh
new file mode 100644
index 0000000000..e3876606d5
--- /dev/null
+++ b/.github/scripts/test-no-error-reports.sh
@@ -0,0 +1,27 @@
+if [[ -d "run/crash-reports" ]]; then
+  echo "Crash reports detected:"
+  cat $directory/*
+  exit 1
+fi
+
+if grep --quiet "Fatal errors were detected" server.log; then
+  echo "Fatal errors detected:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" server.log; then
+  echo "Server force stopped:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet 'Done .+ For help, type "help" or "?"' server.log; then
+  echo "Server didn't finish startup:"
+  cat server.log
+  exit 1
+fi
+
+echo "No crash reports detected"
+exit 0
+
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000000..08df9fe89f
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Build and test
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        fetch-depth: 0
+    
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: gradle
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup the workspace
+      run: ./gradlew setupCIWorkspace
+
+    - name: Build the mod
+      run: ./gradlew build
+
+    - name: Run server for 1.5 minutes
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt  
+        timeout 90 ./gradlew runServer | tee --append server.log || true
+
+    - name: Test no errors reported during server run
+      run: |
+        chmod +x .github/scripts/test-no-error-reports.sh
+        .github/scripts/test-no-error-reports.sh
diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml
new file mode 100644
index 0000000000..96d37f7d9a
--- /dev/null
+++ b/.github/workflows/release-tags.yml
@@ -0,0 +1,61 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Release tagged build
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Setup the workspace
+        run: ./gradlew setupCIWorkspace
+
+      - name: Build the mod
+        run: ./gradlew build
+
+      - name: Release under current tag
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
+          prerelease: false
+          title: "${{ env.RELEASE_VERSION }}"
+          files: build/libs/*.jar
+
+      - name: Set repository owner and name
+        run: |
+          echo "REPOSITORY_OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
+          echo "REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
+
+      - name: Publish package
+        run: ./gradlew publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ARTIFACT_GROUP_ID: com.github.${{ env.REPOSITORY_OWNER }}
+          ARTIFACT_ID: "${{ env.REPOSITORY_NAME }}"
+          ARTIFACT_VERSION: "${{ env.RELEASE_VERSION }}"
+          REPOSITORY_NAME: "${{ env.REPOSITORY_NAME }}"
+          REPOSITORY_OWNER: "${{ env.REPOSITORY_OWNER }}"
+    
diff --git a/.gitignore b/.gitignore
index 3d66b81105..558ad12d27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,28 @@
-.gradle/
-run/
-.settings/
+.gradle
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
 .classpath
 .project
-bin/
-out/
-libs/gregtech*
-CREDITS-fml.txt
-LICENSE-fml.txt
-MinecraftForge-Credits.txt
-MinecraftForge-License.txt
-CoreMod.iml
-CoreMod.ipr
-CoreMod.iws
-Idea.bat
-SetupDevWorkspaces.bat
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
 *.iml
 *.ipr
 *.iws
-*.bat
-.idea/workspace.xml
-*.db
-*.log
-.idea/
-\.directory
-asm/
-config/
-saves/
-usernamecache.json
-PlayerCache.dat
-GregTech.cfg
-options.txt
-GregTech.lang
-mods/
-classes/
-logs/
-libs/AsieLib-1.7.10-0.4.9-deobf.jar
-libs/Computronics-1.7.10-1.6.6-deobf.jar
-libs/Galacticraft-API-1.7-3.0.12.504.jar
-libs/GTNewHorizonsCoreMod-1.7.10-1.6.10.jar
-libs/MicdoodleCore-1.7-3.0.12.504.jar
-libs/worldedit-forge-mc1.7.10-6.1.1-dist.jar
-eclipse/
+src/main/resources/mixins.*.json
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 58eebb4aa5..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "AVRcore"]
-	path = AVRcore
-	url = https://github.com/Technus/AVRcore
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..2ec9a2ebac
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,562 @@
+//version: be36e1399d5622c152db7c530c48e17cde0ce1bb
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
+
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
+buildscript {
+    repositories {
+        maven {
+            name = "forge"
+            url = "https://maven.minecraftforge.net"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+        maven {
+            name = "Scala CI dependencies"
+            url = "https://repo1.maven.org/maven2/"
+        }
+        maven {
+            name = "jitpack"
+            url = "https://jitpack.io"
+        }
+    }
+    dependencies {
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
+    }
+}
+
+plugins {
+    id 'idea'
+    id 'scala'
+    id("org.ajoberstar.grgit") version("3.1.1")
+    id("com.github.johnrengelman.shadow") version("4.0.4")
+    id("com.palantir.git-version") version("0.12.3")
+    id("maven-publish")
+}
+
+apply plugin: 'forge'
+
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+}
+
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(getFile(targetFile).exists() == false) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+if(coreModClass) {
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
+
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+'git config core.fileMode false'.execute()
+// Pulls version from git tag
+try {
+    version = minecraftVersion + "-" + gitVersion()
+}
+catch (Exception e) {
+    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
+
+minecraft {
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
+    runDir = "run"
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            replace gradleTokenVersion, versionDetails().lastTag
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
+}
+
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)
+}
+
+repositories {
+    maven {
+        name = "Overmind forge repo mirror"
+        url = "https://gregtech.overminddl1.com/"
+    }
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
+    }
+}
+
+dependencies {
+    if(usesMixins.toBoolean()) {
+        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
+        annotationProcessor("com.google.guava:guava:24.1.1-jre")
+        annotationProcessor("com.google.code.gson:gson:2.8.6")
+        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: "launchwrapper"
+            exclude module: "guava"
+            exclude module: "gson"
+            exclude module: "commons-io"
+            exclude module: "log4j-core"
+        }
+        compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
+    }
+}
+
+apply from: 'dependencies.gradle'
+
+def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+
+task generateAssets {
+    if(usesMixins.toBoolean()) {
+        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
+}
+
+"""
+    }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+}
+
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
+
+afterEvaluate {
+    if(usesMixins.toBoolean()) {
+        tasks.compileJava {
+            options.compilerArgs += [
+                    "-AreobfSrgFile=${tasks.reobf.srg}",
+                    "-AoutSrgFile=${mixinSrg}",
+                    "-AoutRefMapFile=${refMap}",
+                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                    "-XDenableSunApiLintControl",
+                    "-XDignore.symbol.file"
+            ]
+        }
+    }
+}
+
+runClient {
+    def arguments = []
+
+    if(usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+}
+
+runServer {
+    def arguments = []
+
+    if (usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    args(arguments)
+}
+
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
+}
+
+processResources
+        {
+            // this will ensure that this task is redone when the versions change.
+            inputs.property "version", project.version
+            inputs.property "mcversion", project.minecraft.version
+
+            // replace stuff in mcmod.info, nothing else
+            from(sourceSets.main.resources.srcDirs) {
+                include 'mcmod.info'
+
+                // replace version and mcversion
+                expand "minecraftVersion": project.minecraft.version,
+                        "modVersion": versionDetails().lastTag,
+                        "modId": modId,
+                        "modName": modName
+            }
+
+            if(usesMixins.toBoolean()) {
+                from refMap
+            }
+
+            // copy everything else, thats not the mcmod.info
+            from(sourceSets.main.resources.srcDirs) {
+                exclude 'mcmod.info'
+            }
+        }
+
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+}
+
+task shadowDevJar(type: ShadowJar) {
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation]
+}
+
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
+}
+
+task apiJar(type: Jar) {
+    from (sourceSets.main.allJava) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    archives sourcesJar
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// publishing
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifact source: jar
+            artifact source: sourcesJar, classifier: "src"
+            artifact source: devJar, classifier: "dev"
+            if (apiPackage) {
+                archives source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: group
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            version = System.getenv("ARTIFACT_VERSION") ?: project.version
+        }
+    }
+    
+    repositories {
+        maven {
+            String owner = System.getenv("REPOSITORY_OWNER") ?: "Unknown"
+            String repositoryName = System.getenv("REPOSITORY_NAME") ?: "Unknown"
+            String githubRepositoryUrl = "https://maven.pkg.github.com/$owner/$repositoryName"
+            name = "GitHubPackages"
+            url = githubRepositoryUrl
+            credentials {
+                username = System.getenv("GITHUB_ACTOR") ?: "NONE"
+                password = System.getenv("GITHUB_TOKEN") ?: "NONE"
+            }
+        }
+    }
+}
+
+// Updating
+task updateBuildScript {
+    doLast {
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+}
+
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("build.gradle")
+        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
+
+// Helper methods
+
+def checkPropertyExists(String propertyName) {
+    if (project.hasProperty(propertyName) == false) {
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
+}
diff --git a/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index 29a4f8b6de..0000000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,292 +0,0 @@
-import net.minecraftforge.gradle.user.UserExtension
-import java.io.FileInputStream
-import java.util.*
-import java.io.*
-
-buildscript {
-    repositories {
-        mavenCentral()
-        maven("https://gregtech.overminddl1.com/")
-        maven("https://jitpack.io")
-        
-    }
-    dependencies {
-        classpath("com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT"){
-            isChanging = true
-        }
-    }
-}
-
-plugins {
-    idea
-    java
-    signing
-}
-
-apply(plugin = "forge")
-
-//Downloads Javadocs and sources by default
-idea {
-    module {
-        this.isDownloadJavadoc = true
-        this.isDownloadSources = true
-    }
-}
-
-//Set Java to version 1.8
-java {
-    this.sourceCompatibility = JavaVersion.VERSION_1_8
-    this.targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-//Set standard encoding
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
-//Add extra sources here
-sourceSets.getByName("main") {
-    java.srcDir("src/main/java")
-    java.srcDir("AVRcore/src")
-}
-
-//Load Minecraft Version
-val Project.minecraft: UserExtension
-    get() = extensions.getByName<UserExtension>("minecraft")
-
-//TODO Delete this! This exists to load the configs from the real properties file, which is needed for Jenkins to build
-//Gradle will load gradle.properties from it's home, it's install, and the project folder. Clearly whoever setup the
-//Jenkins jar signing needs to be reminded of this!
-val prop = Properties()
-prop.load(FileInputStream("real.gradle.properties"))
-val propSign = Properties()
-propSign.load(FileInputStream("gradle.properties"))
-
-//TODO Delete
-val projectVersion: String = prop.getProperty("projectVersion")
-//TODO Uncomment
-//val projectVersion: String by project
-
-//Generates a hash for each new commit to differentiate versions
-var commitHash = Runtime
-        .getRuntime()
-        .exec("git rev-parse --short HEAD")
-        .let { process ->
-            process.waitFor()
-            val output = process.inputStream.use {
-                it.bufferedReader().use(BufferedReader::readText)
-            }
-            process.destroy()
-            output.trim()
-        }
-
-minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
-version = "$projectVersion-$commitHash"
-group = "com.github.technus"
-
-//Minecraft Block
-configure<UserExtension> {
-    //Replaces version inside the mod
-    this.includes.addAll(
-            arrayOf(
-                    "Reference.java"
-            )
-    )
-    this.replacements.putAll(
-            mapOf(
-                    Pair("GRADLETOKEN_VERSION", project.version)
-            )
-    )
-
-    //This is sometimes called 'eclipse' instead
-    this.runDir = "run"
-}
-
-repositories {
-    mavenLocal()
-    maven("https://gregtech.overminddl1.com/") { this.name = "GT6Maven" }
-    maven("http://maven.ic2.player.to/") { this.name = "ic2" }
-    maven("http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/") { this.name = "UsrvDE/GTNH" }
-    ivy {
-        this.name = "gtnh_download_source_underscores"
-        this.artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]")
-    }
-    ivy {
-        this.name = "gtnh_download_source"
-        this.artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]")
-    }
-    ivy {
-        this.name = "BuildCraft"
-        this.artifactPattern("http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision](-[classifier]).[ext]")
-    }
-    maven("http://maven.cil.li/") { this.name = "OpenComputers" }
-    maven("http://default.mobiusstrip.eu/maven") { this.name = "Jabba" }
-    maven("http://chickenbones.net/maven/") { this.name = "CodeChicken" }
-    maven("http://www.ryanliptak.com/maven/") { this.name = "appleCore" }
-    maven("https://jitpack.io")
-}
-
-dependencies {
-    //Local Libraries
-    compile(fileTree("libs") { this.include("*.jar") })
-
-    //TODO Uncomment
-    //Versions from properties
-    //val ic2Version: String by project
-    //val gt5uVersion: String by project
-    //val yamcoreVersion: String by project
-    //val opencomputersVersion: String by project
-    //val computercraftVersion: String by project
-    //val baublesVersion: String by project
-    //val thaumcraftVersion: String by project
-    //val codechickenlibVersion: String by project
-    //val codechickencoreVersion: String by project
-    //val neiVersion: String by project
-    //val wailaVersion: String by project
-    //val galacticraftVersion: String by project
-    //val galacticGregVersion: String by project
-    //val buildcraftVersion: String by project
-    //val forestryVersion: String by project
-    //val enderioVersion: String by project
-    //val enderCoreVersion: String by project
-
-    //TODO Delete
-    val ic2Version: String = prop.getProperty("ic2Version")
-    val gt5uVersion: String = prop.getProperty("gt5uVersion")
-    val yamcoreVersion: String = prop.getProperty("yamcoreVersion")
-    val opencomputersVersion: String = prop.getProperty("opencomputersVersion")
-    val computercraftVersion: String = prop.getProperty("computercraftVersion")
-    val baublesVersion: String = prop.getProperty("baublesVersion")
-    val thaumcraftVersion: String = prop.getProperty("thaumcraftVersion")
-    val codechickenlibVersion: String = prop.getProperty("codechickenlibVersion")
-    val codechickencoreVersion: String = prop.getProperty("codechickencoreVersion")
-    val neiVersion: String = prop.getProperty("neiVersion")
-    val wailaVersion: String = prop.getProperty("wailaVersion")
-    val galacticraftVersion: String = prop.getProperty("galacticraftVersion")
-    val galacticGregVersion: String = prop.getProperty("galacticGregVersion")
-    val buildcraftVersion: String = prop.getProperty("buildcraftVersion")
-    val forestryVersion: String = prop.getProperty("forestryVersion")
-    val enderioVersion: String = prop.getProperty("enderioVersion")
-    val enderCoreVersion: String = prop.getProperty("enderCoreVersion")
-
-    //Hard Dependencies
-    compile("net.industrial-craft:industrialcraft-2:$ic2Version:dev")
-    compile("com.github.GTNewHorizons:StructureLib:1.0.9:deobf")
-    compile("com.github.GTNewHorizons:GT5-Unofficial:$gt5uVersion:dev"){
-        exclude("net.industrial-craft", "industrialcraft-2")
-        isChanging = true
-    }
-    compile("eu.usrv:YAMCore:$yamcoreVersion:deobf")
-
-    //Compile Dependencies
-    compileOnly("li.cil.oc:OpenComputers:$opencomputersVersion:dev")
-    compileOnly("dan200.computercraft:ComputerCraft:$computercraftVersion")
-    compile("com.azanor.baubles:Baubles:$baublesVersion:deobf")
-    compile("thaumcraft:Thaumcraft:$thaumcraftVersion:dev")
-    compile("codechicken:CodeChickenLib:$codechickenlibVersion:dev")
-    compile("codechicken:CodeChickenCore:$codechickencoreVersion:dev")
-    compile("codechicken:NotEnoughItems:$neiVersion:dev")
-
-    //Optional Libraries for Testing
-    runtimeOnly("mcp.mobius.waila:Waila:$wailaVersion")
-
-    //runtimeOnly("micdoodle8.mods:MicdoodleCore:$galacticraftVersion:Dev")
-    //runtimeOnly("micdoodle8.mods:GalacticraftCore:$galacticraftVersion:Dev")
-    //runtimeOnly("micdoodle8.mods:Galacticraft-Planets:$galacticraftVersion:Dev")
-    //runtimeOnly("com.github.GTNewHorizons:GalacticGregGT5:$galacticGregVersion")
-    //runtimeOnly("com.mod-buildcraft:buildcraft:$buildcraftVersion:dev")
-    //runtimeOnly("net.sengir.forestry:forestry_1.7.10:$forestryVersion:dev")
-    //runtimeOnly("com.enderio.core:EnderCore:$enderCoreVersion:dev")
-    //runtimeOnly("com.enderio:EnderIO:$enderioVersion:dev"){
-    //    exclude("com.enderio.core", "EnderCore")
-    //    exclude("mcp.mobius.waila", "Waila")
-    //}
-
-    configurations.all {
-        resolutionStrategy.cacheDynamicVersionsFor(30, "seconds")
-    }
-}
-
-
-
-
-tasks.withType<Jar> {
-    //Mark as outdated if versions change
-    this.inputs.properties += "version" to project.version
-    this.inputs.properties += "mcversion" to project.minecraft.version
-    this.archiveBaseName.set("TecTech-${project.minecraft.version}")
-
-    //Replace versions in mcmod.info
-    this.filesMatching("/mcmod.info") {
-        this.expand(
-                mapOf(
-                        "version" to project.version,
-                        "mcversion" to project.minecraft.version
-                )
-        )
-    }
-}
-
-//Load AVRcore
-val submodulesUpdate by tasks.creating(Exec::class) {
-    this.description = "Updates (and inits) git submodules"
-    this.group = "Build Setup"
-    this.commandLine("git", "submodule", "update", "--init", "--recursive", "--remote")
-}
-tasks.named("setupCIWorkspace") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("setupDevWorkspace") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("setupDecompWorkspace") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("compileJava") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("sourceMainJava") {
-    dependsOn(":submodulesUpdate")
-}
-
-tasks.jar {
-    //Needed for access transformer which allows nerfing hardness of blocks
-    this.manifest.attributes(
-            mapOf(
-                    Pair("FMLAT", "tectech_at.cfg")
-            )
-    )
-}
-
-val sourcesJar by tasks.creating(Jar::class) {
-    this.from(sourceSets.main.get().allSource)
-    this.archiveClassifier.set("sources")
-}
-
-val devJar by tasks.creating(Jar::class) {
-    this.from(sourceSets.main.get().output)
-    this.archiveClassifier.set("dev")
-}
-
-artifacts {
-    this.archives(sourcesJar)
-    this.archives(devJar)
-}
-
-tasks.register("signJar") {
-    dependsOn("reobf")
-}
-
-//TODO Fix, but technically it was never fully implemented
-//signing {
-//    sign(tasks["jar"])
-//}
-//
-//tasks.named("signJar") {
-//    allprojects {
-//        extra["signing.keyId"] = propSign.getProperty("keyStoreAlias")
-//        extra["signing.secretKeyRingFile"] = propSign.getProperty("keyStore")
-//        extra["signing.password"] = propSign.getProperty("keyStorePass")
-//    }
-//    dependsOn(":reobf")
-//}
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000000..6d229574c1
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,43 @@
+// Add your dependencies here
+
+dependencies {
+    shadowImplementation("com.github.GTNewHorizons:AVRcore:add-build-script-SNAPSHOT")
+
+    compile("com.github.GTNewHorizons:GT5-Unofficial:master-SNAPSHOT:dev")
+    compile("com.github.GTNewHorizons:Yamcl:master-SNAPSHOT:dev")
+
+    /*compile("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev") {  // Transitive by GT5-Unofficial
+        transitive = false
+    }
+    compile("com.github.GTNewHorizons:CodeChickenLib:master-SNAPSHOT:dev") {  // Transitive by GT5-Unofficial
+        transitive = false
+    }
+    compile("com.github.GTNewHorizons:StructureLib:master-SNAPSHOT:dev") {  // Transitive by GT5-Unofficial
+        transitive = false
+    }
+    compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") {  // Transitive by GT5-Unofficial
+        transitive = false
+    }*/
+
+    compileOnly("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+
+    compileOnly("dan200.computercraft:ComputerCraft:1.75") {
+        transitive = false
+    }
+    compileOnly("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") {
+        transitive = false
+    }
+    compileOnly("curse.maven:cofh-core-69162:2388751") {
+        transitive = false
+    }
+    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
+        transitive = false
+    }
+
+    compileOnly files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
+}
diff --git a/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar b/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
new file mode 100644
index 0000000000..e854bf7df9
Binary files /dev/null and b/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar differ
diff --git a/draw_io_graph.png b/draw_io_graph.png
new file mode 100644
index 0000000000..241c41d604
Binary files /dev/null and b/draw_io_graph.png differ
diff --git a/gradle.properties b/gradle.properties
index 7fc32d532c..3d49d30e98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,64 @@
-#Dummy File, replaced in Jenkins
-systemProp.org.gradle.internal.http.connectionTimeout=120000
-systemProp.org.gradle.internal.http.socketTimeout=120000
-keyStoreAlias=w
-keyStore=w
-keyStorePass=w
+modName = TecTech - Tec Technology!
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = tectech
+
+modGroup = com.github.technus.tectech
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = "Developer"
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = Reference.java
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenGroupName =
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile = tectech_at.cfg
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
+mixinPlugin =
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+mixinsPackage =
+# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
+# This parameter is for legacy compatability only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = false
+
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = true
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# projects. New projects should not use this parameter.
+customArchiveBaseName = TecTech
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960ec..5c2d1cf016 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5028f28f8e..3ab0b725ef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d517..83f2acfdc3 100644
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index f9553162f1..9618d8d960 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000000..09bbb514fc
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+before_install:
+  - ./gradlew setupCIWorkspace
\ No newline at end of file
diff --git a/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar b/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar
deleted file mode 100644
index 7a53464d53..0000000000
Binary files a/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar and /dev/null differ
diff --git a/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar b/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar
deleted file mode 100644
index 181475fc38..0000000000
Binary files a/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar and /dev/null differ
diff --git a/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar b/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
deleted file mode 100644
index e854bf7df9..0000000000
Binary files a/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar and /dev/null differ
diff --git a/real.gradle.properties b/real.gradle.properties
deleted file mode 100644
index 5cf1722acc..0000000000
--- a/real.gradle.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-systemProp.org.gradle.internal.http.connectionTimeout=120000
-systemProp.org.gradle.internal.http.socketTimeout=120000
-projectVersion=4.10.8
-ic2Version=2.2.828-experimental
-gt5uVersion=experimental-SNAPSHOT
-yamcoreVersion=1.7.10-0.5.79
-opencomputersVersion=MC1.7.10-1.7.5.1291
-computercraftVersion=1.75
-baublesVersion=1.7.10-1.0.1.10
-thaumcraftVersion=1.7.10-4.2.3.5
-codechickenlibVersion=1.7.10-1.1.3.140
-codechickencoreVersion=1.7.10-1.0.7.47
-neiVersion=1.7.10-1.0.5.120
-wailaVersion=1.5.10_1.7.10
-galacticraftVersion=1.7-3.0.12.504
-galacticGregVersion=master-SNAPSHOT
-buildcraftVersion=7.1.23
-forestryVersion=4.4.0.0
-enderioVersion=1.7.10-2.3.0.429_beta
-enderCoreVersion=1.7.10-0.2.0.39_beta
diff --git a/repositories.gradle b/repositories.gradle
new file mode 100644
index 0000000000..130197c8aa
--- /dev/null
+++ b/repositories.gradle
@@ -0,0 +1,26 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    maven {
+        name "OpenComputers Repo"
+        url = "http://maven.cil.li/"
+    }
+    maven {
+        name = "sponge"
+        url = "https://repo.spongepowered.org/repository/maven-public"
+    }
+    maven {
+        name = "ic2"
+        url = "http://maven.ic2.player.to/"
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        url "https://cursemaven.com"
+    }
+    maven {
+        url = "https://jitpack.io"
+    }
+}
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index f7fc68f278..21ecee23f8 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,10 +1,10 @@
 [
 {
-  "modid": "tectech",
-  "name": "TecTech",
+  "modid": "${modId}",
+  "name": "${modName}",
   "description": "TecTech - Tec Technology Interdimensional! Replace UUMatter with something overly complicated and annoying! (GT5u Addon)",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "",
   "updateUrl": "",
   "authorList": ["_Technus_"],
-- 
cgit 


From 048b3f5fec7d0e04ec748a279c47734567d84678 Mon Sep 17 00:00:00 2001
From: GTNH-Afx237v7 <64365566+GTNH-Afx237v7@users.noreply.github.com>
Date: Wed, 15 Dec 2021 13:08:06 +0100
Subject: Adjust ultimate battery soldering alloy amount

see #9131
---
 .../tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index ba72375f80..85db52223c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -1384,7 +1384,7 @@ public class DreamCraftRecipeLoader implements Runnable {
                 ItemList.Circuit_Parts_DiodeASMD.get(64),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64),
         }, new FluidStack[]{
-                Materials.SolderingAlloy.getMolten(3760),
+                Materials.SolderingAlloy.getMolten(4608),
                 Materials.Naquadria.getMolten(9216),
                 new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000)
         }, ItemList.ZPM3.get(1), 4000, 1600000);
-- 
cgit 


From b5a887dda2d7ad191c29427a9ab33a3f834ef114 Mon Sep 17 00:00:00 2001
From: Johann Bernhardt <johann.bernhardt@tum.de>
Date: Sun, 19 Dec 2021 09:15:05 +0100
Subject: Fix dependency

---
 dependencies.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 6d229574c1..dca1d2612f 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    shadowImplementation("com.github.GTNewHorizons:AVRcore:add-build-script-SNAPSHOT")
+    shadowImplementation("com.github.GTNewHorizons:AVRcore:master-SNAPSHOT")
 
     compile("com.github.GTNewHorizons:GT5-Unofficial:master-SNAPSHOT:dev")
     compile("com.github.GTNewHorizons:Yamcl:master-SNAPSHOT:dev")
-- 
cgit 


From bb064e24a37791838c49f5db2537acfe3cfbc36f Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sat, 8 Jan 2022 21:16:46 +0100
Subject: Add aspect EM containers to creative tab

---
 .../thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java | 2 +-
 .../elementalMatter/definitions/AspectDefinitionCompatEnabled.java     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
index 2d531858d0..c3231e6132 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
  */
 public class AspectDefinitionCompat {
     public static AspectDefinitionCompat aspectDefinitionCompat;
-    static final HashMap<cElementalDefinition,String> defToAspect = new HashMap<>();
+    public static final HashMap<cElementalDefinition,String> defToAspect = new HashMap<>();
     public static final HashMap<String,cElementalDefinition> aspectToDef = new HashMap<>();
 
     public void run(){}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
index da930a1d79..3cb2eafccd 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
@@ -8,6 +8,7 @@ import thaumcraft.api.aspects.Aspect;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
 
 /**
  * Created by Tec on 21.05.2017.
@@ -58,6 +59,8 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                 }
             }
         }
+
+        STACKS_REGISTERED.addAll(defToAspect.keySet());
     }
 
     @Override
-- 
cgit 


From de8bf3e68e9e4d7cee485d0d6951a4e4ccb5859d Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 9 Jan 2022 19:19:04 +0100
Subject: Cleanup and update EM turret projectile

---
 .../entity/projectiles/projectileEM.java           | 55 +++++++++-------------
 .../tileentity/turret/TileTurretHeadEM.java        | 19 +++++++-
 .../core/transformations/bTransformationInfo.java  |  7 ++-
 .../item/DebugElementalInstanceContainer_EM.java   |  5 +-
 4 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index 702ed77315..92acd71ecd 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -18,6 +18,8 @@ import openmodularturrets.tileentity.turretbase.TurretBase;
 import openmodularturrets.util.PlayerUtil;
 import openmodularturrets.util.TurretHeadUtil;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+
 
 /**
  * Created by Bass on 27/07/2017.
@@ -26,7 +28,7 @@ public class projectileEM extends LaserProjectile {
     public float gravity=0;
     private TurretBase turretBase;
 
-    private boolean exotic, antiMatter,isAmped;
+    private boolean strange, antiMatter,isAmped;
 
     private int ampLevel;
 
@@ -45,36 +47,23 @@ public class projectileEM extends LaserProjectile {
         }
     }
 
-    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) {
+    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStack projectileContent) {
         super(par1World, turretBase);
         this.turretBase = turretBase;
-        boolean onlyQuarks=true;
-        if(avalableEM!=null && avalableEM.hasStacks()) {
-            for (cElementalInstanceStack stack : avalableEM.values()) {
-                if (!(stack.definition instanceof eQuarkDefinition)) {
-                    onlyQuarks = false;
-                }
-            }
-            if (onlyQuarks) {
-                avalableEM.clear();
-            } else {
-                cElementalInstanceStack consumeFromThis=avalableEM.get(TecTech.RANDOM.nextInt(avalableEM.size()));
-                massFactor =(float) (consumeFromThis.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
+        if(projectileContent != null){
+            massFactor =(float) (projectileContent.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
 
-                if(consumeFromThis.definition.getType()>1 || consumeFromThis.definition.getType()<-1) {
-                    exotic = true;
-                }
-                if(consumeFromThis.definition.getType()<0) {
-                    antiMatter = true;
-                }
-
-                if (consumeFromThis.definition.getCharge() == 0) {
-                    gravity = massFactor / 100f;
-                } else {
-                    gravity = Math.min(0.0025F / Math.abs(consumeFromThis.definition.getCharge()), massFactor / 100f);
-                }
+            if(projectileContent.definition.getType()>1 || projectileContent.definition.getType()<-1) {
+                strange = true;
+            }
+            if(projectileContent.definition.getType()<0) {
+                antiMatter = true;
+            }
 
-                avalableEM.removeAmount(false,consumeFromThis.definition.getStackForm(1));
+            if (projectileContent.definition.getCharge() == 0) {
+                gravity = massFactor / 100f;
+            } else {
+                gravity = Math.min(0.0025F / Math.abs(projectileContent.definition.getCharge()), massFactor / 100f);
             }
         }
         //todo make the recipe require some overflow hatches
@@ -97,7 +86,8 @@ public class projectileEM extends LaserProjectile {
                         worldObj.createExplosion(null,
                                 movingobjectposition.blockX + 0.5D,
                                 movingobjectposition.blockY + 0.5D,
-                                movingobjectposition.blockZ + 0.5D, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
+                                movingobjectposition.blockZ + 0.5D,
+                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                     } else {
                         return;
                     }
@@ -107,18 +97,18 @@ public class projectileEM extends LaserProjectile {
             if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
                 worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.RANDOM.nextFloat() + 0.5F);
                 if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
-                    float damage = (exotic?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
+                    float damage = (strange ?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
 
                     if(movingobjectposition.entityHit instanceof EntityPlayer) {
                         if(canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) {
-                            movingobjectposition.entityHit.setFire((exotic?10:1)*2);
+                            movingobjectposition.entityHit.setFire((strange ?10:1)*2);
                             movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
                             if(antiMatter) {
                                 movingobjectposition.entityHit.hurtResistantTime = 0;
                             }
                         }
                     } else {
-                        movingobjectposition.entityHit.setFire((exotic?10:1)*2);
+                        movingobjectposition.entityHit.setFire((strange ?10:1)*2);
                         movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
                         if(antiMatter) {
                             movingobjectposition.entityHit.hurtResistantTime = 0;
@@ -133,7 +123,8 @@ public class projectileEM extends LaserProjectile {
                         worldObj.createExplosion(null,
                                 movingobjectposition.entityHit.posX,
                                 movingobjectposition.entityHit.posY,
-                                movingobjectposition.entityHit.posZ, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
+                                movingobjectposition.entityHit.posZ,
+                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                     }
                 }
             }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 2de6b39c4c..1c8d476a36 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -1,8 +1,12 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret;
 
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -13,6 +17,8 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
+
 /**
  * Created by Bass on 27/07/2017.
  */
@@ -64,7 +70,18 @@ public class TileTurretHeadEM extends TurretHead{
 
     @Override
     public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) {
-        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), hatchContentPointer);
+        while(hatchContentPointer!=null && hatchContentPointer.hasStacks()) {
+            cElementalInstanceStack stack = hatchContentPointer.get(TecTech.RANDOM.nextInt(hatchContentPointer.size()));
+            if(stack.amount<AVOGADRO_CONSTANT_KIND_OF_SMALLER){
+                hatchContentPointer.remove(stack.definition);
+                continue;
+            }
+            hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+            stack=stack.clone();
+            stack.amount = AVOGADRO_CONSTANT;
+            return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
+        }
+        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
index 55ee24e2f6..ec5391a0b4 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformation
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.util.DoubleCount;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraft.item.ItemStack;
@@ -20,8 +21,12 @@ import static com.github.technus.tectech.thing.item.DebugElementalInstanceContai
  */
 public class bTransformationInfo {
     public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000)/6.02214076e23D;
+    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000)/AVOGADRO_CONSTANT;
+    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / (144 * 1000);
+    public static final double AVOGADRO_CONSTANT_KIND_OF_SMALLER =AVOGADRO_CONSTANT-AVOGADRO_CONSTANT_EPSILON;
+    public static final double AVOGADRO_CONSTANT_KIND_OF_BIGGER =AVOGADRO_CONSTANT+AVOGADRO_CONSTANT_EPSILON;
     public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
+    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
 
     public static final Map<Integer,aFluidQuantizationInfo> fluidQuantization=new HashMap<>(32);
     public static final Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization=new HashMap<>(32);
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index 6850b24e0f..bfd7d266c0 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -31,8 +31,7 @@ import java.util.TreeSet;
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -145,7 +144,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         for(iElementalDefinition definition: STACKS_REGISTERED){
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT))));
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 144 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_144))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1000 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT *1000))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1000 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
         }
     }
 
-- 
cgit 


From e84ef7e2100575e7941a6329edc56dafa261aee7 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 13 Jan 2022 22:27:27 +0100
Subject: This should make the EM anomaly and projectile as it was

---
 .../tectech/compatibility/gtpp/GtppAtomLoader.java |  53 ++---
 .../openComputers/AvrArchitecture.java             |   2 +-
 .../entity/projectiles/projectileEM.java           | 105 ++++-----
 .../tileentity/turret/TileTurretHeadEM.java        |  11 +-
 .../definitions/AspectDefinitionCompat.java        |  30 ---
 .../definitions/AspectDefinitionCompatEnabled.java |  81 -------
 .../definitions/dComplexAspectDefinition.java      |   8 +-
 .../definitions/ePrimalAspectDefinition.java       |   7 +-
 .../definitions/iElementalAspect.java              |   8 -
 .../transformations/AspectDefinitionCompat.java    |  29 +++
 .../AspectDefinitionCompatEnabled.java             |  81 +++++++
 .../thing/metaTileEntity/multi/EssentiaCompat.java |  10 +-
 .../multi/EssentiaCompatEnabled.java               |  33 +--
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |  74 ++++--
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |  14 +-
 .../github/technus/tectech/loader/MainLoader.java  |   6 +-
 .../tectech/loader/thing/MachineLoader.java        |  13 +-
 .../tectech/mechanics/anomaly/AnomalyHandler.java  | 247 +++++++++++++--------
 .../tectech/mechanics/anomaly/CancerCommand.java   |  10 +-
 .../tectech/mechanics/anomaly/ChargeCommand.java   |  10 +-
 .../core/transformations/bTransformationInfo.java  |  53 +++--
 .../definitions/complex/dAtomDefinition.java       | 163 +++++++-------
 .../definitions/complex/dHadronDefinition.java     |   4 +-
 .../GT_MetaTileEntity_Hatch_OverflowElemental.java |  10 +-
 .../multi/GT_MetaTileEntity_EM_decay.java          |   2 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |  12 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |   2 +-
 .../thing/tileEntity/ReactorSimTileEntity.java     |   2 +-
 28 files changed, 590 insertions(+), 490 deletions(-)
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java

diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index 32db2caed9..f3120fda25 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.compatibility.gtpp;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -58,34 +59,34 @@ public class GtppAtomLoader implements Runnable{
         }
         //endregion
 
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
         generate("GERMANIUM",true,true);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
 
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
 
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java
index 2842a71df3..595d814fc5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java
@@ -21,7 +21,7 @@ import li.cil.oc.api.machine.Signal;
 import li.cil.oc.common.SaveHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import org.apache.commons.io.IOUtils;
+import org.apache.commons.compress.utils.IOUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index 92acd71ecd..a0b6106151 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -1,10 +1,8 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -18,8 +16,6 @@ import openmodularturrets.tileentity.turretbase.TurretBase;
 import openmodularturrets.util.PlayerUtil;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-
 
 /**
  * Created by Bass on 27/07/2017.
@@ -33,6 +29,7 @@ public class projectileEM extends LaserProjectile {
     private int ampLevel;
 
     private float massFactor;
+    private double mass,charge;
 
     public projectileEM(World par1World) {
         super(par1World);
@@ -51,6 +48,8 @@ public class projectileEM extends LaserProjectile {
         super(par1World, turretBase);
         this.turretBase = turretBase;
         if(projectileContent != null){
+            mass=projectileContent.getMass();
+            charge=projectileContent.getCharge();
             massFactor =(float) (projectileContent.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
 
             if(projectileContent.definition.getType()>1 || projectileContent.definition.getType()<-1) {
@@ -66,66 +65,70 @@ public class projectileEM extends LaserProjectile {
                 gravity = Math.min(0.0025F / Math.abs(projectileContent.definition.getCharge()), massFactor / 100f);
             }
         }
-        //todo make the recipe require some overflow hatches
-
-        //todo add more subspace pollution
     }
 
     @Override
     protected void onImpact(MovingObjectPosition movingobjectposition) {
         if(ticksExisted > 1) {
-            if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
-                Block hitBlock = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ);
-                if(hitBlock != null){
-                    if (hitBlock.getMaterial().isSolid() && TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) {
-                        worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.RANDOM.nextFloat() + 0.5F);
-                        GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
-                                movingobjectposition.blockX,
-                                movingobjectposition.blockY,
-                                movingobjectposition.blockZ);
-                        worldObj.createExplosion(null,
-                                movingobjectposition.blockX + 0.5D,
-                                movingobjectposition.blockY + 0.5D,
-                                movingobjectposition.blockZ + 0.5D,
-                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
-                    } else {
-                        return;
-                    }
-                }
-            }
-
-            if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
+            if(!worldObj.isRemote){
                 worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.RANDOM.nextFloat() + 0.5F);
-                if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
-                    float damage = (strange ?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
-
-                    if(movingobjectposition.entityHit instanceof EntityPlayer) {
-                        if(canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) {
+                switch (movingobjectposition.typeOfHit){
+                    case BLOCK:
+                        Block hitBlock = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ);
+                        if(hitBlock != null){
+                            if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter && hitBlock.getMaterial().isSolid()) {
+                                GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
+                                        movingobjectposition.blockX,
+                                        movingobjectposition.blockY,
+                                        movingobjectposition.blockZ);
+                                worldObj.createExplosion(null,
+                                        movingobjectposition.blockX + 0.5D,
+                                        movingobjectposition.blockY + 0.5D,
+                                        movingobjectposition.blockZ + 0.5D,
+                                        TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * (strange ? 10 : 1) * massFactor * (isAmped ? ampLevel * .1f + 1 : 1) * (ticksExisted / 250f), true);
+                            } else {
+                                return;
+                            }
+                        }
+                        break;
+                    case ENTITY:
+                        float damage = (strange ?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
+
+                        if(movingobjectposition.entityHit instanceof EntityPlayer) {
+                            EntityPlayer player=(EntityPlayer)movingobjectposition.entityHit;
+                            if(canDamagePlayer(player)) {
+                                movingobjectposition.entityHit.setFire((strange ?10:1)*2);
+                                movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
+                                if(antiMatter) {
+                                    movingobjectposition.entityHit.hurtResistantTime = 0;
+                                }
+                                if(strange){
+                                    TecTech.anomalyHandler.addCancer(player,mass);
+                                }
+                                if(charge!=0) {
+                                    TecTech.anomalyHandler.addCharge(player,charge);
+                                }
+                            }
+                        } else {
                             movingobjectposition.entityHit.setFire((strange ?10:1)*2);
                             movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
                             if(antiMatter) {
                                 movingobjectposition.entityHit.hurtResistantTime = 0;
                             }
                         }
-                    } else {
-                        movingobjectposition.entityHit.setFire((strange ?10:1)*2);
-                        movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
-                        if(antiMatter) {
-                            movingobjectposition.entityHit.hurtResistantTime = 0;
+
+                        if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) {
+                            GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
+                                    (int)movingobjectposition.entityHit.posX,
+                                    (int)movingobjectposition.entityHit.posY,
+                                    (int)movingobjectposition.entityHit.posZ);
+                            worldObj.createExplosion(null,
+                                    movingobjectposition.entityHit.posX,
+                                    movingobjectposition.entityHit.posY,
+                                    movingobjectposition.entityHit.posZ,
+                                    (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                         }
-                    }
-
-                    if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) {
-                        GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
-                                (int)movingobjectposition.entityHit.posX,
-                                (int)movingobjectposition.entityHit.posY,
-                                (int)movingobjectposition.entityHit.posZ);
-                        worldObj.createExplosion(null,
-                                movingobjectposition.entityHit.posX,
-                                movingobjectposition.entityHit.posY,
-                                movingobjectposition.entityHit.posZ,
-                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
-                    }
+                        break;
                 }
             }
             setDead();
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 1c8d476a36..fd039a0630 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -5,8 +5,6 @@ import com.github.technus.tectech.compatibility.openmodularturrets.entity.projec
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -17,7 +15,8 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
 
 /**
  * Created by Bass on 27/07/2017.
@@ -72,8 +71,8 @@ public class TileTurretHeadEM extends TurretHead{
     public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) {
         while(hatchContentPointer!=null && hatchContentPointer.hasStacks()) {
             cElementalInstanceStack stack = hatchContentPointer.get(TecTech.RANDOM.nextInt(hatchContentPointer.size()));
-            if(stack.amount<AVOGADRO_CONSTANT_KIND_OF_SMALLER){
-                hatchContentPointer.remove(stack.definition);
+            if(stack.amount<AVOGADRO_CONSTANT_DIMINISHED){
+                TecTech.anomalyHandler.addAnomaly(this,hatchContentPointer.remove(stack.definition).getMass());//todo reduce
                 continue;
             }
             hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
@@ -82,6 +81,8 @@ public class TileTurretHeadEM extends TurretHead{
             return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
         }
         return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
+
+        //todo make the recipe require some overflow hatches
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
deleted file mode 100644
index c3231e6132..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import java.util.HashMap;
-
-/**
- * Created by Tec on 21.05.2017.
- */
-public class AspectDefinitionCompat {
-    public static AspectDefinitionCompat aspectDefinitionCompat;
-    public static final HashMap<cElementalDefinition,String> defToAspect = new HashMap<>();
-    public static final HashMap<String,cElementalDefinition> aspectToDef = new HashMap<>();
-
-    public void run(){}
-
-    Object getAspect(cElementalDefinition definition){
-        return null;
-    }
-
-    String getAspectTag(cElementalDefinition definition){
-        return null;
-    }
-
-    iElementalDefinition getDefinition(String aspect){
-        return null;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
deleted file mode 100644
index 3cb2eafccd..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import thaumcraft.api.aspects.Aspect;
-
-import java.util.ArrayList;
-
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-
-/**
- * Created by Tec on 21.05.2017.
- */
-public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
-    @Override
-    public void run(){
-        defToAspect.put(magic_air,"aer");
-        defToAspect.put(magic_earth,"terra");
-        defToAspect.put(magic_fire,"ignis");
-        defToAspect.put(magic_water,"aqua");
-        defToAspect.put(magic_order,"ordo");
-        defToAspect.put(magic_entropy,"perditio");
-
-        aspectToDef.put("aer",magic_air);
-        aspectToDef.put("terra",magic_earth);
-        aspectToDef.put("ignis",magic_fire);
-        aspectToDef.put("aqua",magic_water);
-        aspectToDef.put("ordo",magic_order);
-        aspectToDef.put("perditio",magic_entropy);
-
-        ArrayList<Aspect> list=Aspect.getCompoundAspects();
-        Aspect[] array= list.toArray(new Aspect[0]);
-        while (!list.isEmpty()) {
-            for (Aspect aspect : array) {
-                if (list.contains(aspect)) {
-                    Aspect[] content = aspect.getComponents();
-                    if (content.length != 2) {
-                        list.remove(aspect);
-                    }else if(aspectToDef.containsKey(content[0].getTag()) && aspectToDef.containsKey(content[1].getTag())){
-                        try {
-                            dComplexAspectDefinition newAspect;
-                            if(content[0].getTag().equals(content[1].getTag())){
-                                newAspect = new dComplexAspectDefinition(aspectToDef.get(content[0].getTag()).getStackForm(2)
-                                );
-                            }else{
-                                newAspect = new dComplexAspectDefinition(aspectToDef.get(content[0].getTag()).getStackForm(1), aspectToDef.get(content[1].getTag()).getStackForm(1)
-                                );
-                            }
-                            aspectToDef.put(aspect.getTag(),newAspect);
-                            defToAspect.put(newAspect,aspect.getTag());
-                        }catch (tElementalException e) {
-                            /**/
-                        }finally {
-                            list.remove(aspect);
-                        }
-                    }
-                }
-            }
-        }
-
-        STACKS_REGISTERED.addAll(defToAspect.keySet());
-    }
-
-    @Override
-    Aspect getAspect(cElementalDefinition definition) {
-        return Aspect.getAspect(defToAspect.get(definition));
-    }
-
-    @Override
-    String getAspectTag(cElementalDefinition definition) {
-        return defToAspect.get(definition);
-    }
-
-    @Override
-    iElementalDefinition getDefinition(String aspect) {
-        return aspectToDef.get(aspect);
-    }
-
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
index ddef29b214..8f570c1247 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
@@ -24,7 +25,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class dComplexAspectDefinition extends cElementalDefinition implements iElementalAspect {
+public final class dComplexAspectDefinition extends cElementalDefinition {
     private final int hash;
     public final double mass;
 
@@ -252,11 +253,6 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
         return null;
     }
 
-    @Override
-    public Object materializeIntoAspect() {
-        return AspectDefinitionCompat.aspectDefinitionCompat.getAspect(this);
-    }
-
     @Override
     public iElementalDefinition getAnti() {
         return null;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
index 02e7d2fe21..9c6d107bff 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
@@ -8,7 +8,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class ePrimalAspectDefinition extends cElementalPrimitive implements iElementalAspect {
+public final class ePrimalAspectDefinition extends cElementalPrimitive {
     public static final ePrimalAspectDefinition
             magic_air = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
             magic_earth = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
@@ -35,11 +35,6 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement
         return translateToLocal("tt.keyword.Primal") + ": " + name;
     }
 
-    @Override
-    public Object materializeIntoAspect() {
-        return AspectDefinitionCompat.aspectDefinitionCompat.getAspect(this);
-    }
-
     @Override
     public boolean isTimeSpanHalfLife() {
         return false;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java
deleted file mode 100644
index 3cb2d8e5e8..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-/**
- * Created by Tec on 21.05.2017.
- */
-public interface iElementalAspect {
-    Object materializeIntoAspect();
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
new file mode 100644
index 0000000000..343071e26e
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -0,0 +1,29 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
+
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import java.util.HashMap;
+
+/**
+ * Created by Tec on 21.05.2017.
+ */
+public class AspectDefinitionCompat {
+    public static AspectDefinitionCompat aspectDefinitionCompat;
+    public final HashMap<iElementalDefinition,String> defToAspect = new HashMap<>();
+    public final HashMap<String,iElementalDefinition> aspectToDef = new HashMap<>();
+
+    public void run(){}
+
+    public Object getAspect(iElementalDefinition definition){
+        return null;
+    }
+
+    public String getAspectTag(iElementalDefinition definition){
+        return null;
+    }
+
+    public iElementalDefinition getDefinition(String aspect){
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
new file mode 100644
index 0000000000..446e9b66d5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -0,0 +1,81 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
+
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import thaumcraft.api.aspects.Aspect;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+
+/**
+ * Created by Tec on 21.05.2017.
+ */
+public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
+    @Override
+    public void run(){
+        defToAspect.put(magic_air,"aer");
+        defToAspect.put(magic_earth,"terra");
+        defToAspect.put(magic_fire,"ignis");
+        defToAspect.put(magic_water,"aqua");
+        defToAspect.put(magic_order,"ordo");
+        defToAspect.put(magic_entropy,"perditio");
+
+        aspectToDef.put("aer",magic_air);
+        aspectToDef.put("terra",magic_earth);
+        aspectToDef.put("ignis",magic_fire);
+        aspectToDef.put("aqua",magic_water);
+        aspectToDef.put("ordo",magic_order);
+        aspectToDef.put("perditio",magic_entropy);
+
+        ArrayList<Aspect> list=Aspect.getCompoundAspects();
+        Aspect[] array= list.toArray(new Aspect[0]);
+        while (!list.isEmpty()) {
+            for (Aspect aspect : array) {
+                if (list.contains(aspect)) {
+                    Aspect[] content = aspect.getComponents();
+                    if (content.length != 2) {
+                        list.remove(aspect);
+                    }else if(aspectToDef.containsKey(content[0].getTag()) && aspectToDef.containsKey(content[1].getTag())){
+                        try {
+                            dComplexAspectDefinition newAspect;
+                            if(content[0].getTag().equals(content[1].getTag())){
+                                newAspect = new dComplexAspectDefinition(
+                                        aspectToDef.get(content[0].getTag()).getStackForm(2));
+                            }else{
+                                newAspect = new dComplexAspectDefinition(
+                                        aspectToDef.get(content[0].getTag()).getStackForm(1),
+                                        aspectToDef.get(content[1].getTag()).getStackForm(1));
+                            }
+                            aspectToDef.put(aspect.getTag(),newAspect);
+                            defToAspect.put(newAspect,aspect.getTag());
+                        }catch (tElementalException e) {
+                            /**/
+                        }finally {
+                            list.remove(aspect);
+                        }
+                    }
+                }
+            }
+        }
+
+        STACKS_REGISTERED.addAll(defToAspect.keySet());
+    }
+
+    @Override
+    public Aspect getAspect(iElementalDefinition definition) {
+        return Aspect.getAspect(defToAspect.get(definition));
+    }
+
+    @Override
+    public String getAspectTag(iElementalDefinition definition) {
+        return defToAspect.get(definition);
+    }
+
+    @Override
+    public iElementalDefinition getDefinition(String aspect) {
+        return aspectToDef.get(aspect);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
index e77cab2734..63f55912a6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 
@@ -18,11 +18,15 @@ public class EssentiaCompat {
         return null;
     }
 
-    public boolean putElementalInstanceStack(TileEntity conatainer, cElementalInstanceStack stack){
+    public String getEssentiaName(iElementalDefinition stack){
+        return null;
+    }
+
+    public boolean putInContainer(TileEntity container, String name){
         return false;
     }
 
-    public cElementalInstanceStack getFromContainer(TileEntity container){
+    public iElementalDefinition getFromContainer(TileEntity container){
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
index 484377b179..03ff92b4e0 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
@@ -1,8 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.iElementalAspect;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 import thaumcraft.api.aspects.Aspect;
@@ -11,7 +9,7 @@ import thaumcraft.api.aspects.IAspectContainer;
 import thaumcraft.common.tiles.TileEssentiaReservoir;
 import thaumcraft.common.tiles.TileJarFillable;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompat.aspectToDef;
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat;
 
 /**
  * Created by Tec on 21.05.2017.
@@ -30,22 +28,28 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
     }
 
     @Override
-    public boolean putElementalInstanceStack(TileEntity container,cElementalInstanceStack stack){
-        if(container==null || container.isInvalid()) {
+    public String getEssentiaName(iElementalDefinition stack) {
+        return aspectDefinitionCompat.defToAspect.get(stack);
+    }
+
+    @Override
+    public boolean putInContainer(TileEntity container, String aspectName) {
+        if (container == null || container.isInvalid() || aspectName == null || aspectName.isEmpty()) {
             return false;
         }
-        if(container instanceof IAspectContainer && stack.definition instanceof iElementalAspect){
-            Aspect aspect=(Aspect) ((iElementalAspect) stack.definition).materializeIntoAspect();
-            if(aspect!=null){
-                ((IAspectContainer) container).addToContainer(aspect,1);
-                return true;
+        if (container instanceof IAspectContainer) {
+            Aspect aspect = Aspect.getAspect(aspectName);
+            if(aspect==null){
+                return false;
             }
+            int remaining=((IAspectContainer) container).addToContainer(aspect, 1);
+            return remaining==0;
         }
         return false;
     }
 
     @Override
-    public cElementalInstanceStack getFromContainer(TileEntity container){
+    public iElementalDefinition getFromContainer(TileEntity container){
         if(container==null || container.isInvalid()) {
             return null;
         }
@@ -55,10 +59,7 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
                 Aspect[] aspectsArr= aspects.getAspects();
                 if(aspectsArr!=null && aspectsArr[0]!=null){
                      if (((IAspectContainer) container).takeFromContainer(aspectsArr[0],1)){
-                         cElementalDefinition def=aspectToDef.get(aspectsArr[0].getTag());
-                         if(def!=null){
-                             return new cElementalInstanceStack(def,1);
-                         }
+                         return aspectDefinitionCompat.aspectToDef.get(aspectsArr[0].getTag());
                      }
                 }
             }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 87e2660e01..c11a68b5d0 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -1,12 +1,11 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer;
@@ -19,12 +18,16 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
+import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -61,6 +64,8 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.2"),//3 - Elemental Overflow Hatches or Elemental Casing
             translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.3"),//General - Some sort of Essentia Storage
     };
+
+    private String outputEssentiaName;
     //endregion
 
     public GT_MetaTileEntity_EM_essentiaDequantizer(int aID, String aName, String aNameRegional) {
@@ -88,24 +93,49 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             stopMachine();
             return false;
         }
+
         cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContainerHandler();
-        if (inputHatchContainer.hasStacks()) {
-            cElementalInstanceStack stack = inputHatchContainer.getFirst();
-            inputHatchContainer.removeAmount(false, new cElementalInstanceStack(stack.definition, 1));
-            if (!essentiaContainerCompat.putElementalInstanceStack(container, stack)) {
-                cleanStackEM_EM(stack);
-            }
-            mMaxProgresstime = 20;
-            mEfficiencyIncrease = 10000;
-            eAmpereFlow = 1;
-            if (stack.definition instanceof ePrimalAspectDefinition) {
-                mEUt = (int) -V[8];
+        if (inputHatchContainer == null || !inputHatchContainer.hasStacks()) {
+            return false;
+        }
+
+        cElementalInstanceStack stack = inputHatchContainer.get(TecTech.RANDOM.nextInt(inputHatchContainer.size()));
+        if (stack.amount < AVOGADRO_CONSTANT_DIMINISHED) {
+            cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+            mEUt = (int) -V[6];
+        } else {
+            outputEssentiaName = essentiaContainerCompat.getEssentiaName(stack.definition);
+            Aspect aspect = Aspect.getAspect(outputEssentiaName);
+            if (aspect == null) {
+                outputEssentiaName = null;
+                cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+                mEUt = (int) -V[7];
             } else {
-                mEUt = (int) -V[10];
+                inputHatchContainer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+                if (aspect.isPrimal()) {
+                    mEUt = (int) -V[8];
+                } else {
+                    mEUt = (int) -V[10];
+                }
+            }
+        }
+        mMaxProgresstime = 20;
+        mEfficiencyIncrease = 10000;
+        eAmpereFlow = 1;
+        return true;
+    }
+
+    @Override
+    public void outputAfterRecipe_EM() {
+        TileEntity container = essentiaContainerCompat.getContainer(this);
+        if (container == null) {
+            stopMachine();
+        }else{
+            if(!essentiaContainerCompat.putInContainer(container,outputEssentiaName)){
+                stopMachine();
             }
-            return true;
         }
-        return false;
+        outputEssentiaName=null;
     }
 
     @Override
@@ -147,4 +177,16 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
     public String[] getStructureDescription(ItemStack stackSize) {
         return description;
     }
+
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setString("eOutputEssentia",outputEssentiaName);
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        outputEssentiaName=aNBT.getString("eOutputEssentia");
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index a716420e81..74dff47aa4 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -5,8 +5,9 @@ import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defin
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer;
@@ -19,12 +20,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -83,16 +84,15 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
-        TileEntity container = essentiaContainerCompat.getContainer(this);
-        cElementalInstanceStack newStack = essentiaContainerCompat.getFromContainer(container);
-        if (newStack != null) {
+        iElementalDefinition definition  = essentiaContainerCompat.getFromContainer(essentiaContainerCompat.getContainer(this));
+        if (definition != null) {
             mMaxProgresstime = 20;
             mEfficiencyIncrease = 10000;
             eAmpereFlow = 1;
             outputEM = new cElementalInstanceStackMap[]{
-                    new cElementalInstanceStackMap(newStack)
+                    new cElementalInstanceStackMap(new cElementalInstanceStack(definition,AVOGADRO_CONSTANT))
             };
-            if (newStack.definition instanceof ePrimalAspectDefinition) {
+            if (definition instanceof ePrimalAspectDefinition) {
                 mEUt = (int) -V[8];
             } else {
                 mEUt = (int) -V[10];
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index d473da6b07..b3c8d24a7c 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompat;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompatEnabled;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompatEnabled;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompatEnabled;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
@@ -40,7 +40,7 @@ import java.util.HashSet;
 
 import static com.github.technus.tectech.util.CommonValues.*;
 import static com.github.technus.tectech.TecTech.*;
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompat.aspectDefinitionCompat;
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat;
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index 0bf8c57f24..91dbffa71f 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -15,6 +15,7 @@ import cpw.mods.fml.common.Loader;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.CustomItemList.*;
 
@@ -73,22 +74,22 @@ public class MachineLoader implements Runnable {
         // ===================================================================================================
 
         eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f).getStackForm(1L));
+                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f).getStackForm(1L));
+                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f).getStackForm(1L));
+                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f).getStackForm(1L));
+                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f).getStackForm(1L));
+                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f).getStackForm(1L));
+                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         
         // ===================================================================================================
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index dd388bc233..0e1771e88d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -1,7 +1,6 @@
 package com.github.technus.tectech.mechanics.anomaly;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
@@ -9,6 +8,7 @@ import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
 import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
@@ -28,15 +29,20 @@ import net.minecraftforge.event.world.ChunkEvent;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
-    public static final double SWAP_THRESHOLD = dAtomDefinition.getSomethingHeavy().getMass() * 10000D;
-    public static final int COUNT_DIV=32;
-    public static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
-    public static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
-    public static final int MEAN_DELAY =50;
-    private static final float CHARGE_EFFECTIVENESS = 10;
-    private static final float CHARGE_EXPLOSIVENESS = 5;
+    private static final double SWAP_THRESHOLD = dAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
+    private static final int COUNT_DIV=32;
+    private static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
+    private static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
+    private static final int MEAN_DELAY =50;
+    private static final double CANCER_EFFECTIVENESS = 1/AVOGADRO_CONSTANT;
+    private static final double CHARGE_EFFECTIVENESS = 10/AVOGADRO_CONSTANT;
+    private static final double CHARGE_EXPLOSIVENESS = 5/AVOGADRO_CONSTANT;
 
     private boolean fixMe=false;
     private final ArrayList<EntityPlayer> playersWithCharge = new ArrayList<>();
@@ -62,8 +68,9 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     public void tickWorld(HashMap<Integer, ChunkDataHandler.ChunkHashMap> data, TickEvent.WorldTickEvent aEvent) {
         if (TecTech.RANDOM.nextInt(MEAN_DELAY) == 0) {
             int dim = aEvent.world.provider.dimensionId;
-            data.get(dim).forEach((chunkCoordIntPair, compound) -> {
-                if (compound.getDouble(INTENSITY) >= SWAP_THRESHOLD) {
+            ChunkDataHandler.ChunkHashMap chunkHashMap = data.get(dim);
+            chunkHashMap.forEach((chunkCoordIntPair, compound) -> {
+                if (compound.getDouble(INTENSITY) > SWAP_THRESHOLD) {
                     Chunk chunk = aEvent.world.getChunkFromChunkCoords(chunkCoordIntPair.chunkXPos, chunkCoordIntPair.chunkZPos);
                     if (chunk.isChunkLoaded) {
                         worldDataArrayList.add(chunk);
@@ -72,21 +79,25 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
             });
             if (worldDataArrayList.size() >= 2) {
                 Chunk a = worldDataArrayList.remove(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
-                Chunk b = worldDataArrayList.remove(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
-                double avg = .5 * (data.get(dim).get(a.getChunkCoordIntPair()).getDouble(INTENSITY) +
-                        data.get(dim).get(b.getChunkCoordIntPair()).getDouble(INTENSITY));
-                data.get(dim).get(a.getChunkCoordIntPair()).setDouble(INTENSITY, Math.min(SWAP_THRESHOLD, avg * (TecTech.RANDOM.nextFloat() + .5F) * 0.5F));
-                data.get(dim).get(b.getChunkCoordIntPair()).setDouble(INTENSITY, Math.min(SWAP_THRESHOLD, avg * (TecTech.RANDOM.nextFloat() + .5F) * 0.5F));
-                data.get(dim).markForTransmissionToClient(a.getChunkCoordIntPair());
-                data.get(dim).markForTransmissionToClient(b.getChunkCoordIntPair());
-                swapSomething(a, b, (float) Math.min(Math.log10(avg), 20));
+                Chunk b = worldDataArrayList.get(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
+                ChunkCoordIntPair aCoords = a.getChunkCoordIntPair();
+                ChunkCoordIntPair bCoords = b.getChunkCoordIntPair();
+
+                double newValue = (chunkHashMap.get(aCoords).getDouble(INTENSITY) +
+                        chunkHashMap.get(bCoords).getDouble(INTENSITY))/2-SWAP_THRESHOLD/8;
+                float split=TecTech.RANDOM.nextFloat();
+
+                chunkHashMap.get(aCoords).setDouble(INTENSITY, newValue * split);
+                chunkHashMap.get(bCoords).setDouble(INTENSITY, newValue * (1-split));
+                chunkHashMap.markForTransmissionToClient(aCoords);
+                chunkHashMap.markForTransmissionToClient(bCoords);
+                swapSomething(a, b, newValue);
             }
             worldDataArrayList.clear();
         }
         for (Object o : aEvent.world.playerEntities) {
             if (o instanceof EntityPlayer && !((EntityPlayer) o).capabilities.isCreativeMode) {
-                float charge = TecTech.playerPersistence.getDataOrSetToNewTag((EntityPlayer) o).getFloat(SPACE_CHARGE);
-                if (charge != 0) {
+                if (getCharge((EntityPlayer) o) != 0) {
                     playersWithCharge.add((EntityPlayer) o);
                 }
             }
@@ -94,25 +105,25 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         if (playersWithCharge.size() > 0) {
             outer:
             for (EntityPlayer other : playersWithCharge) {
-                float fieldOther = TecTech.playerPersistence.getDataOrSetToNewTag(other).getFloat(SPACE_CHARGE);
+                double fieldOther = getCharge(other);
                 for (EntityPlayer player : playersWithCharge) {
                     if (other == player) {
                         continue outer;
                     }
-                    float field = TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE);
-                    float difference = Math.abs(field - fieldOther);
-                    if (difference != 0) {
+                    double field = getCharge(player);
+                    double absDifference = Math.abs(field - fieldOther);
+                    if (absDifference != 0) {
                         if (player.getDistanceSqToEntity(other) < 1) {
-                            float avg = (fieldOther + field) / 2;
-                            addAnomaly(other.worldObj.provider.dimensionId, new ChunkCoordIntPair(other.chunkCoordX, other.chunkCoordZ), Math.min(SWAP_THRESHOLD, PER_PARTICLE * difference));
-                            other.worldObj.createExplosion(other, other.posX, other.posY, other.posZ, Math.min(CHARGE_EXPLOSIVENESS * difference, 25), true);
-                            player.worldObj.createExplosion(player, player.posX, player.posY, player.posZ, Math.min(CHARGE_EXPLOSIVENESS * difference, 25), true);
-                            TecTech.playerPersistence.getDataOrSetToNewTag(player).setFloat(SPACE_CHARGE, avg);
-                            TecTech.playerPersistence.getDataOrSetToNewTag(other).setFloat(SPACE_CHARGE, avg);
-                            TecTech.playerPersistence.saveData(player);
-                            TecTech.playerPersistence.saveData(other);
-                            NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
-                            NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(other));
+                            double avg = (fieldOther + field) / 2;
+                            //addAnomaly(other.worldObj.provider.dimensionId, new ChunkCoordIntPair(other.chunkCoordX, other.chunkCoordZ), Math.min(SWAP_THRESHOLD, PER_PARTICLE * absDifference));
+                            if(TecTech.configTecTech.BOOM_ENABLE){
+                                other.worldObj.createExplosion(other, other.posX, other.posY, other.posZ,(float) Math.min(CHARGE_EXPLOSIVENESS * absDifference, 25), true);
+                                player.worldObj.createExplosion(player, player.posX, player.posY, player.posZ, (float) Math.min(CHARGE_EXPLOSIVENESS * absDifference, 25), true);
+                            }
+                            GT_Utility.sendSoundToPlayers(other.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int)other.posX, (int)other.posY, (int)other.posZ);
+                            GT_Utility.sendSoundToPlayers(player.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int)player.posX, (int)player.posY, (int)player.posZ);
+                            setCharge(player,avg);
+                            setCharge(other,avg);
                         }
                     }
                 }
@@ -121,8 +132,9 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         }
     }
 
-    private void swapSomething(Chunk a,Chunk b,float power) {
-        for (int i = 0; i < 64; i++) {
+    private void swapSomething(Chunk a,Chunk b,double mass) {
+        float explosionPower=(float) Math.log(mass/AVOGADRO_CONSTANT);
+        for (int i = 0; i < Math.min((int)explosionPower,64); i++) {
             int x = TecTech.RANDOM.nextInt(16);
             int y = TecTech.RANDOM.nextInt(a.worldObj.getActualHeight());
             int z = TecTech.RANDOM.nextInt(16);
@@ -143,12 +155,14 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 a.worldObj.setBlockToAir((a.xPosition << 4) + x, y, (a.zPosition << 4) + z);
                 b.worldObj.setBlockToAir((b.xPosition << 4) + x, y, (b.zPosition << 4) + z);
             }
-            if (TecTech.RANDOM.nextBoolean()) {
-                a.worldObj.createExplosion(null, (a.xPosition << 4) + x + .5, y + .5, (a.zPosition << 4) + z + .5, power, true);
+            if(TecTech.configTecTech.BOOM_ENABLE){
+                if (TecTech.RANDOM.nextBoolean()) {
+                    a.worldObj.createExplosion(null, (a.xPosition << 4) + x + .5, y + .5, (a.zPosition << 4) + z + .5, explosionPower*TecTech.RANDOM.nextFloat(), true);
+                }
                 GT_Utility.sendSoundToPlayers(a.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (a.xPosition << 4) + x, y, (a.zPosition << 4) + z);
-            }
-            if (TecTech.RANDOM.nextBoolean()) {
-                b.worldObj.createExplosion(null, (b.xPosition << 4) + x + .5, y + .5, (b.zPosition << 4) + z + .5, power, true);
+                if (TecTech.RANDOM.nextBoolean()) {
+                    b.worldObj.createExplosion(null, (b.xPosition << 4) + x + .5, y + .5, (b.zPosition << 4) + z + .5, explosionPower*TecTech.RANDOM.nextFloat(), true);
+                }
                 GT_Utility.sendSoundToPlayers(b.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (b.xPosition << 4) + x, y, (b.zPosition << 4) + z);
             }
         }
@@ -156,13 +170,13 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         int z = (b.xPosition - a.xPosition) << 4;
         List<EntityLivingBase> aE = a.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(a));
         List<EntityLivingBase> bE = b.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(b));
-        aE.forEach(o -> {
+        for (EntityLivingBase entityLivingBase : aE) {
             if (TecTech.RANDOM.nextBoolean()) {
-                o.setPositionAndUpdate(o.posX + x, o.posY, o.posZ + z);
-                o.attackEntityFrom(MainLoader.subspace,8+TecTech.RANDOM.nextInt(8));
-                if(o instanceof EntityPlayer){
-                    EntityPlayer player=((EntityPlayer) o);
-                    if(!player.capabilities.isCreativeMode) {
+                if (entityLivingBase instanceof EntityPlayer) {
+                    EntityPlayer player = ((EntityPlayer) entityLivingBase);
+                    if (!player.capabilities.isCreativeMode) {
+                        player.setPositionAndUpdate(entityLivingBase.posX + x, entityLivingBase.posY, entityLivingBase.posZ + z);
+                        player.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4)));
                         player.addPotionEffect(new PotionEffect(Potion.hunger.id, 1200));
                         player.addPotionEffect(new PotionEffect(Potion.weakness.id, 1000));
                         player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 800));
@@ -171,36 +185,35 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                         player.addPotionEffect(new PotionEffect(Potion.poison.id, 200));
                         player.addPotionEffect(new PotionEffect(Potion.blindness.id, 100));
                         player.addPotionEffect(new PotionEffect(Potion.wither.id, 60));
-                        TecTech.playerPersistence.getDataOrSetToNewTag(player).setFloat(SPACE_CHARGE,
-                                TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE)-(float)Math.abs(TecTech.RANDOM.nextGaussian()));
-                        TecTech.playerPersistence.saveData(player);
-                        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+                        addCharge(player, -mass * TecTech.RANDOM.nextFloat());
                     }
+                } else {
+                    entityLivingBase.setPositionAndUpdate(entityLivingBase.posX + x, entityLivingBase.posY, entityLivingBase.posZ + z);
+                    entityLivingBase.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4)));
                 }
             }
-        });
-        bE.forEach(o -> {
+        }
+        for (EntityLivingBase o : bE) {
             if (TecTech.RANDOM.nextBoolean()) {
-                o.setPositionAndUpdate(o.posX - x, o.posY, o.posZ - z);
-                o.attackEntityFrom(MainLoader.subspace,8+TecTech.RANDOM.nextInt(8));
-                if(o instanceof EntityPlayer){
-                    EntityPlayer player=((EntityPlayer) o);
-                    if(!player.capabilities.isCreativeMode) {
+                if (o instanceof EntityPlayer) {
+                    EntityPlayer player = ((EntityPlayer) o);
+                    if (!player.capabilities.isCreativeMode) {
+                        player.setPositionAndUpdate(o.posX - x, o.posY, o.posZ - z);
+                        player.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) -(explosionPower / 4)));
                         player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 800));
                         player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 600));
                         player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 400));
                         player.addPotionEffect(new PotionEffect(Potion.jump.id, 200));
                         player.addPotionEffect(new PotionEffect(Potion.resistance.id, 100));
                         player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60));
-                        TecTech.playerPersistence.getDataOrSetToNewTag(player).setFloat(SPACE_CHARGE,
-                                TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE)+(float)Math.abs(TecTech.RANDOM.nextGaussian()));
-
-                        TecTech.playerPersistence.saveData(player);
-                        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+                        addCharge(player, mass * TecTech.RANDOM.nextFloat());
                     }
+                } else {
+                    o.setPositionAndUpdate(o.posX + x, o.posY, o.posZ + z);
+                    o.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4)));
                 }
             }
-        });
+        }
     }
 
     @Override
@@ -218,38 +231,36 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 }
             }
 
-            data.get(player.worldObj.provider.dimensionId).forEach((chunkCoordIntPair, dat) -> {
+            for (Map.Entry<ChunkCoordIntPair, NBTTagCompound> entry : data.get(player.worldObj.provider.dimensionId).entrySet()) {
+                ChunkCoordIntPair chunkCoordIntPair = entry.getKey();
+                NBTTagCompound    dat               = entry.getValue();
                 if (Math.abs(chunkCoordIntPair.getCenterXPos() - player.posX) + Math.abs(chunkCoordIntPair.getCenterZPosition() - player.posZ) < 256) {
-                    for (int i = 0, pow = (int) Math.min(32, dat.getDouble(INTENSITY) / PER_PARTICLE); i < pow; i++) {
+                    for (int i = 0, pow = (int) Math.min(COUNT_DIV, dat.getDouble(INTENSITY) / PER_PARTICLE); i < pow; i++) {
                         TecTech.proxy.em_particle(player.worldObj,
                                 chunkCoordIntPair.getCenterXPos() + TecTech.RANDOM.nextGaussian() * 32D,
                                 player.posY + TecTech.RANDOM.nextFloat() * 128D - 64D,
                                 chunkCoordIntPair.getCenterZPosition() + TecTech.RANDOM.nextGaussian() * 32D);
                     }
                 }
-            });
+            }
         } else if (TecTech.RANDOM.nextInt(50) == 0) {
             EntityPlayer player = aEvent.player;
             ChunkCoordIntPair pair = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ);
             NBTTagCompound compound = data.get(player.worldObj.provider.dimensionId).get(pair);
             NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
             boolean saveRequired = false;
-            if(player.capabilities.isCreativeMode){
-                if (playerTag.getDouble(SPACE_CANCER) != 0) {
-                    playerTag.setDouble(SPACE_CANCER, 0);
-                    saveRequired = true;
-                }
-            }else {
+            if (!player.capabilities.isCreativeMode) {
+                double cancer=getCancer(player);
                 if (compound != null) {
                     int badness = (int) Math.min(COUNT_DIV, compound.getDouble(INTENSITY) / PER_PARTICLE);
                     if (badness > 0) {
-                        playerTag.setDouble(SPACE_CANCER, Math.min(2, playerTag.getDouble(SPACE_CANCER) + 9.765625E-4f * badness));
+                        playerTag.setDouble(SPACE_CANCER, Math.min(2, cancer + 9.765625E-4f * badness));
                         player.attackEntityFrom(MainLoader.subspace,Math.max(1,badness/8f));
                         saveRequired = true;
                     }
                 } else if (playerTag.getDouble(SPACE_CANCER) > 0 && !player.isDead) {
                     if (player.ticksExisted % 10 == 0) {
-                        playerTag.setDouble(SPACE_CANCER, Math.max(0, playerTag.getDouble(SPACE_CANCER) - 7.6293945E-5f));
+                        playerTag.setDouble(SPACE_CANCER, Math.max(0, cancer - 7.6293945E-5f));
                         saveRequired = true;
                     }
                 }
@@ -267,29 +278,26 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         EntityPlayer player=TecTech.proxy.getPlayer();
         if(player!=null) {
             if(!player.capabilities.isCreativeMode) {
-                NBTTagCompound tagCompound = TecTech.playerPersistence.getDataOrSetToNewTag(player);
-                if (tagCompound != null) {
-                    float cancer = tagCompound.getFloat(SPACE_CANCER);
-                    if (cancer > 0) {
-                        player.setInvisible(fixMe = TecTech.RANDOM.nextFloat() * 2 < cancer);
-                        player.setAngles((TecTech.RANDOM.nextFloat() - .5F) * 36 * cancer, (TecTech.RANDOM.nextFloat() - .5F) * 36 * cancer);
-                        cancer*=cancer/2F;
-                        if (cancer > 1.75f) {
-                            player.setVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
-                        } else {
-                            player.addVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
-                        }
+                double cancer = getCancer(player)*CANCER_EFFECTIVENESS;
+                if (cancer > 0) {
+                    player.setInvisible(fixMe = TecTech.RANDOM.nextFloat() * 2 < cancer);
+                    player.setAngles((TecTech.RANDOM.nextFloat() - .5F) * 36 * (float) cancer, (TecTech.RANDOM.nextFloat() - .5F) * 36 * (float) cancer);
+                    cancer*=cancer/2F;
+                    if (cancer > 1.75f) {
+                        player.setVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
+                    } else {
+                        player.addVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
                     }
                 }
 
-                float charge = TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE);
+                double charge = getCharge(player);
                 if(charge!=0) {
                     for (Object o : player.worldObj.playerEntities) {
                         if (o instanceof EntityPlayer && !((EntityPlayer) o).capabilities.isCreativeMode) {
                             EntityPlayer otherPlayer=(EntityPlayer)o;
-                            float chargeOther = TecTech.playerPersistence.getDataOrSetToNewTag(otherPlayer).getFloat(SPACE_CHARGE);
+                            double chargeOther = getCharge(otherPlayer);
                             if (chargeOther != 0 && player != o) {
-                                float reaction = chargeOther * charge;
+                                double reaction = chargeOther * charge;
                                 if (reaction !=0) {
                                     double distanceSq = otherPlayer.getDistanceSqToEntity(player);
                                     if (distanceSq >= 1) {
@@ -328,19 +336,25 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         return 100;
     }
 
-    public void addAnomaly(IGregTechTileEntity iGregTechTileEntity, double amount) {
-        if (iGregTechTileEntity.isServerSide()) {
-            World w = iGregTechTileEntity.getWorld();
+    public void addAnomaly(IGregTechTileEntity gtTile, double amount) {
+        addAnomaly(gtTile.getWorld(),gtTile.getXCoord(),gtTile.getZCoord(),amount);
+    }
+
+    public void addAnomaly(TileEntity tileEntity, double amount) {
+        addAnomaly(tileEntity.getWorldObj(),tileEntity.xCoord,tileEntity.zCoord,amount);
+    }
+
+    public void addAnomaly(World w,int x,int z, double amount) {
+        if (!w.isRemote) {
             addAnomaly(w.provider.dimensionId,
                     new ChunkCoordIntPair(
-                            iGregTechTileEntity.getXCoord() >> 4,
-                            iGregTechTileEntity.getZCoord() >> 4),
+                            x >> 4,
+                            z >> 4),
                     amount);
         }
     }
 
     public void addAnomaly(int world, ChunkCoordIntPair chunk, double amount) {
-        amount=Math.abs(amount);
         NBTTagCompound old = TecTech.chunkDataHandler.getChunkData(this, world, chunk);
         if (old == null) {
             NBTTagCompound data = new NBTTagCompound();
@@ -351,4 +365,45 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         }
         TecTech.chunkDataHandler.getChunkData(this, world).markForTransmissionToClient(chunk);
     }
+
+    public double getCharge(EntityPlayer player){
+        return getDouble(player,SPACE_CHARGE);
+    }
+
+    public void setCharge(EntityPlayer player, double amount){
+        setDouble(player,SPACE_CHARGE,amount);
+    }
+
+    public void addCharge(EntityPlayer player, double amount){
+        addDouble(player,SPACE_CHARGE,amount);
+    }
+
+    public double getCancer(EntityPlayer player){
+        return getDouble(player,SPACE_CANCER);
+    }
+
+    public void setCancer(EntityPlayer player, double amount){
+        setDouble(player,SPACE_CANCER,amount);
+    }
+
+    public void addCancer(EntityPlayer player, double amount){
+        addDouble(player,SPACE_CANCER,amount);
+    }
+
+    public double getDouble(EntityPlayer player,String name){
+        return TecTech.playerPersistence.getDataOrSetToNewTag(player).getDouble(name);
+    }
+
+    public void setDouble(EntityPlayer player,String name, double amount){
+        TecTech.playerPersistence.getDataOrSetToNewTag(player).setDouble(name, amount);
+        TecTech.playerPersistence.saveData(player);
+        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+    }
+
+    public void addDouble(EntityPlayer player,String name, double amount){
+        NBTTagCompound data = TecTech.playerPersistence.getDataOrSetToNewTag(player);
+        data.setDouble(name, amount+data.getDouble(name));
+        TecTech.playerPersistence.saveData(player);
+        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java
index a153671a59..bb61f50aab 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java
@@ -1,19 +1,14 @@
 package com.github.technus.tectech.mechanics.anomaly;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.NetworkDispatcher;
-import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.anomaly.AnomalyHandler.SPACE_CANCER;
-
 public class CancerCommand implements ICommand {
     ArrayList<String> aliases=new ArrayList<>();
 
@@ -39,13 +34,10 @@ public class CancerCommand implements ICommand {
                 return;
             }
             EntityPlayerMP player=(EntityPlayerMP)sender;
-            NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
             if(player.capabilities.isCreativeMode){
                 sender.addChatMessage(new ChatComponentText("Doesn't really work in creative mode!"));
             }else {
-                playerTag.setDouble(SPACE_CANCER, amount);
-                TecTech.playerPersistence.saveData(player);
-                NetworkDispatcher.INSTANCE.sendTo(new PlayerDataMessage.PlayerDataData(player), player);
+                TecTech.anomalyHandler.setCancer(player,amount);
                 sender.addChatMessage(new ChatComponentText("Cancer set to: "+amount));
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java
index da365a92f8..4190cd0dba 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java
@@ -1,19 +1,14 @@
 package com.github.technus.tectech.mechanics.anomaly;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.NetworkDispatcher;
-import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.anomaly.AnomalyHandler.SPACE_CHARGE;
-
 public class ChargeCommand implements ICommand {
     ArrayList<String> aliases=new ArrayList<>();
 
@@ -33,13 +28,10 @@ public class ChargeCommand implements ICommand {
                 return;
             }
             EntityPlayerMP player=(EntityPlayerMP)sender;
-            NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
             if(player.capabilities.isCreativeMode){
                 sender.addChatMessage(new ChatComponentText("Doesn't really work in creative mode!"));
             }else {
-                playerTag.setDouble(SPACE_CHARGE, amount);
-                TecTech.playerPersistence.saveData(player);
-                NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+                TecTech.anomalyHandler.setCharge(player,amount);
                 sender.addChatMessage(new ChatComponentText("Charge set to: "+amount));
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
index ec5391a0b4..69a4b9683c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformation
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.util.DoubleCount;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraft.item.ItemStack;
@@ -10,36 +9,64 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static java.lang.Math.pow;
 
 /**
  * Created by Tec on 26.05.2017.
  */
 public class bTransformationInfo {
+    /**
+     * Atom count per Mol
+     */
     public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000)/AVOGADRO_CONSTANT;
-    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / (144 * 1000);
-    public static final double AVOGADRO_CONSTANT_KIND_OF_SMALLER =AVOGADRO_CONSTANT-AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_KIND_OF_BIGGER =AVOGADRO_CONSTANT+AVOGADRO_CONSTANT_EPSILON;
+    /**
+     * Min. chance of existing
+     */
+    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
+    /**
+     * Quantity considered to be indifferent when computing stuff
+     */
+    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
+    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
     public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
+    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON*144D;
     public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
+    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON*1000D;
 
-    public static final Map<Integer,aFluidQuantizationInfo> fluidQuantization=new HashMap<>(32);
-    public static final Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization=new HashMap<>(32);
-    public static final Map<Integer,aOredictQuantizationInfo> oredictQuantization=new HashMap<>(32);
+    public static bTransformationInfo TRANSFORMATION_INFO = new bTransformationInfo();
+
+    public Map<Integer,aFluidQuantizationInfo> fluidQuantization;
+    public Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization;
+    public Map<Integer,aOredictQuantizationInfo> oredictQuantization;
 
     public Map<iElementalDefinition,aFluidDequantizationInfo> fluidDequantization;
     public Map<iElementalDefinition,aItemDequantizationInfo> itemDequantization;
     public Map<iElementalDefinition,aOredictDequantizationInfo> oredictDequantization;
 
-    public bTransformationInfo(int fluidCap,int itemCap, int oreCap){
-        fluidDequantization = fluidCap > 0 ? new HashMap<>(fluidCap) : Collections.emptyMap();
-        itemDequantization = itemCap > 0 ? new HashMap<>(itemCap) : Collections.emptyMap();
-        oredictDequantization = oreCap > 0 ? new HashMap<>(oreCap) : Collections.emptyMap();
+    private bTransformationInfo() {
+        this(
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
+        );
+    }
+
+    public bTransformationInfo(
+            Map<Integer, aFluidQuantizationInfo> fluidQuantization,
+            Map<aItemQuantizationInfo, aItemQuantizationInfo> itemQuantization,
+            Map<Integer, aOredictQuantizationInfo> oredictQuantization,
+            Map<iElementalDefinition, aFluidDequantizationInfo> fluidDequantization,
+            Map<iElementalDefinition, aItemDequantizationInfo> itemDequantization,
+            Map<iElementalDefinition, aOredictDequantizationInfo> oredictDequantization) {
+        this.fluidQuantization = fluidQuantization;
+        this.itemQuantization = itemQuantization;
+        this.oredictQuantization = oredictQuantization;
+        this.fluidDequantization = fluidDequantization;
+        this.itemDequantization = itemDequantization;
+        this.oredictDequantization = oredictDequantization;
     }
 
     public void addFluid(iHasElementalDefinition em, FluidStack fluidStack){
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
index 965c46cef6..e97d5994e9 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
@@ -42,7 +42,6 @@ public final class dAtomDefinition extends cElementalDefinition {
     private static final byte BYTE_OFFSET=32;
 
     private final int hash;
-    public static final bTransformationInfo TRANSFORMATION_INFO = new bTransformationInfo(16,0,64);
     public static double refMass, refUnstableMass;
 
     private static final byte nbtType = (byte) 'a';
@@ -1319,17 +1318,17 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     @Override
     public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return TRANSFORMATION_INFO.fluidDequantization.get(this);
+        return bTransformationInfo.TRANSFORMATION_INFO.fluidDequantization.get(this);
     }
 
     @Override
     public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return TRANSFORMATION_INFO.itemDequantization.get(this);
+        return bTransformationInfo.TRANSFORMATION_INFO.itemDequantization.get(this);
     }
 
     @Override
     public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return TRANSFORMATION_INFO.oredictDequantization.get(this);
+        return bTransformationInfo.TRANSFORMATION_INFO.oredictDequantization.get(this);
     }
 
     private static final class Nomenclature {
@@ -1475,119 +1474,119 @@ public final class dAtomDefinition extends cElementalDefinition {
         /*----STABLE ATOMS----**/
         refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
 
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
         //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
         //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
 
         /*----UNSTABLE ATOMS----**/
         refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
 
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
         //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
         ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
         ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
 
         try {
             dAtomDefinition temp;
-            TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(deuterium.definition, AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
+            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(deuterium.definition, AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
 
-            TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(tritium.definition, AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
+            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(tritium.definition, AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
 
-            TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(helium_3.definition, AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
+            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(helium_3.definition, AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
 
             temp=new dAtomDefinition(
                     new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 92),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 146)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
 
             double tempMass=temp.getMass();
 
@@ -1596,7 +1595,7 @@ public final class dAtomDefinition extends cElementalDefinition {
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 143)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
 
             TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
 
@@ -1605,14 +1604,14 @@ public final class dAtomDefinition extends cElementalDefinition {
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 145)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
 
             somethingHeavy=new dAtomDefinition(
                     new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 94),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 147)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
 
             TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
index c5efaf1403..4ea5eb3776 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition.getNbtTagCompound;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.TRANSFORMATION_INFO;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static gregtech.api.enums.OrePrefixes.dust;
@@ -467,7 +467,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
         //Added to atom map, but should be in its own
         cElementalDefinitionStack neutrons=new cElementalDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
         TRANSFORMATION_INFO.oredictDequantization.put(neutrons.definition,new aOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
-        bTransformationInfo.oredictQuantization.put(
+        TRANSFORMATION_INFO.oredictQuantization.put(
                 OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
                 new aOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
         );
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
index a5e6dc4d5d..6a9b24ef55 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -28,9 +28,9 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 
 import java.util.Locale;
 
+import static com.github.technus.tectech.loader.MainLoader.elementalPollution;
 import static com.github.technus.tectech.util.CommonValues.DISPERSE_AT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.github.technus.tectech.loader.MainLoader.elementalPollution;
 import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -148,10 +148,10 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
         if (aBaseMetaTileEntity.isServerSide() && aTick % 20 == DISPERSE_AT) {
             if (aBaseMetaTileEntity.isActive()) {
                 if (overflowMatter > overflowDisperse) {
-                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowDisperse);
+                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowDisperse/(Math.pow(2,mTier)));
                     overflowMatter -= overflowDisperse;
                 } else {
-                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter);
+                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter/(Math.pow(2,mTier)));
                     overflowMatter = 0;
                     aBaseMetaTileEntity.setActive(false);
                     aBaseMetaTileEntity.setLightValue((byte) 0);
@@ -225,7 +225,7 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
     @Override
     public void onRemoval() {
         if (isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) {
-            TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), overflowMatter * 8D);
+            TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), overflowMatter);
             if (TecTech.configTecTech.BOOM_ENABLE) {
                 getBaseMetaTileEntity().doExplosion(V[15]);
             } else {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index d534b41fec..ad7a2c91a6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -51,7 +51,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
     public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10* AVOGADRO_CONSTANT;
-    private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 / URANIUM_INGOT_MASS_DIFF;
+    private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 / URANIUM_INGOT_MASS_DIFF;
     public static final double URANIUM_MASS_TO_EU_INSTANT = URANIUM_MASS_TO_EU_PARTIAL * 20;
 
     private String clientLocale = "en_US";
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index d6ab35cd4b..c3e35ba90c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -9,9 +9,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElem
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
@@ -32,6 +31,7 @@ import java.util.ArrayList;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.DEFAULT_ENERGY_LEVEL;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
@@ -98,9 +98,9 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
-                    aItemQuantizationInfo aIQI = bTransformationInfo.itemQuantization.get(new aItemQuantizationInfo(is, false, null));
+                    aItemQuantizationInfo aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, false, null));
                     if (aIQI == null) {
-                        aIQI = bTransformationInfo.itemQuantization.get(new aItemQuantizationInfo(is, true, null));//todo check if works?
+                        aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, true, null));//todo check if works?
                     }
                     if (aIQI == null) {
                         //ORE DICT quantization //todo fix for uranium?
@@ -109,7 +109,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (DEBUG_MODE) {
                                 TecTech.LOGGER.info("Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage() + ' ' + OreDictionary.getOreName(ID));
                             }
-                            aOredictQuantizationInfo aOQI = bTransformationInfo.oredictQuantization.get(ID);
+                            aOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.oredictQuantization.get(ID);
                             if (aOQI == null) {
                                 continue;
                             }
@@ -136,7 +136,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             FluidStack[] inF = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
-                    aFluidQuantizationInfo aFQI = bTransformationInfo.fluidQuantization.get(fs.getFluid().getID());
+                    aFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.fluidQuantization.get(fs.getFluid().getID());
                     if (aFQI == null) {
                         continue;
                     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 9ba6235c83..1fcc0b42f2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -2094,13 +2094,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
     @Override
     public void doExplosion(long aExplosionPower) {
-        explodeMultiblock();
         if (!TecTech.configTecTech.BOOM_ENABLE) {
             TecTech.proxy.broadcast("Multi DoExplosion BOOM! " + getBaseMetaTileEntity().getXCoord() + ' ' + getBaseMetaTileEntity().getYCoord() + ' ' + getBaseMetaTileEntity().getZCoord());
             StackTraceElement[] ste = Thread.currentThread().getStackTrace();
             TecTech.proxy.broadcast("Multi DoExplosion BOOM! " + ste[2].toString());
             return;
         }
+        explodeMultiblock();
         super.doExplosion(aExplosionPower);
     }//Redirecting to explodemultiblock
     //endregion
diff --git a/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java b/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java
index 4d66b28ca6..55fa327364 100644
--- a/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java
+++ b/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java
@@ -89,7 +89,7 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric {
 
     @Override
     public double getReactorEUEnergyOutput() {
-        return (double)(getReactorEnergyOutput() * 5.0F * ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear"));
+        return getReactorEnergyOutput() * 5.0F * ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear");
     }
 
     //public List<TileEntity> getSubTiles() {
-- 
cgit 


From dee0db40e8be451b69bc889dca009267f176b758 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sat, 15 Jan 2022 00:16:05 +0100
Subject: Cleanup EM maps

---
 .../tileentity/turret/TileTurretHeadEM.java        |  27 +-
 .../tileentity/turretbase/TileTurretBaseEM.java    |   4 +-
 .../definitions/dComplexAspectDefinition.java      |  42 +-
 .../definitions/ePrimalAspectDefinition.java       |   2 +-
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |   6 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |   4 +-
 .../elementalMatter/core/cElementalDecay.java      |  75 ---
 .../core/cElementalDecayResult.java                |  41 --
 .../core/cElementalDefinitionStackMap.java         |  65 ---
 .../core/cElementalInstanceStackMap.java           | 565 ---------------------
 .../core/cElementalMutableDefinitionStackMap.java  | 278 ----------
 .../elementalMatter/core/cElementalStackMap.java   | 181 -------
 .../elementalMatter/core/commands/GiveEM.java      |   6 +-
 .../core/decay/cElementalDecay.java                |  77 +++
 .../core/decay/cElementalDecayResult.java          |  43 ++
 .../elementalMatter/core/iElementalContainer.java  |  12 +
 .../core/iElementalInstanceContainer.java          |  10 -
 .../core/maps/cElementalConstantStackMap.java      |  58 +++
 .../core/maps/cElementalDefinitionStackMap.java    |  56 ++
 .../core/maps/cElementalInstanceStackMap.java      | 214 ++++++++
 .../core/maps/cElementalStackMap.java              |  50 ++
 .../elementalMatter/core/maps/iElementalMapR.java  | 187 +++++++
 .../elementalMatter/core/maps/iElementalMapRW.java | 130 +++++
 .../elementalMatter/core/rElementalRecipe.java     |  56 --
 .../elementalMatter/core/rElementalRecipeMap.java  |  70 ---
 .../core/recipes/rElementalRecipe.java             |  57 +++
 .../core/recipes/rElementalRecipeMap.java          |  73 +++
 .../core/stacks/cElementalDefinitionStack.java     |  35 +-
 .../core/stacks/cElementalInstanceStack.java       |  54 +-
 .../core/stacks/iElementalStack.java               |  23 +
 .../core/stacks/iHasElementalDefinition.java       |  18 -
 .../core/templates/cElementalDefinition.java       |  10 +-
 .../core/templates/cElementalPrimitive.java        |   6 +-
 .../core/templates/iElementalDefinition.java       |   6 +-
 .../transformations/aFluidDequantizationInfo.java  |  14 +-
 .../transformations/aFluidQuantizationInfo.java    |  14 +-
 .../transformations/aItemDequantizationInfo.java   |  14 +-
 .../transformations/aItemQuantizationInfo.java     |  16 +-
 .../aOredictDequantizationInfo.java                |  18 +-
 .../transformations/aOredictQuantizationInfo.java  |  18 +-
 .../core/transformations/bTransformationInfo.java  |  16 +-
 .../definitions/complex/dAtomDefinition.java       | 194 ++++---
 .../definitions/complex/dHadronDefinition.java     |  68 ++-
 .../primitive/cPrimitiveDefinition.java            |   2 +-
 .../definitions/primitive/eBosonDefinition.java    |   4 +-
 .../definitions/primitive/eLeptonDefinition.java   |   2 +-
 .../definitions/primitive/eNeutrinoDefinition.java |   2 +-
 .../definitions/primitive/eQuarkDefinition.java    |   2 +-
 .../github/technus/tectech/recipe/TT_recipe.java   |  30 +-
 .../technus/tectech/recipe/TT_recipeAdder.java     |  14 +-
 .../item/DebugElementalInstanceContainer_EM.java   |  12 +-
 .../item/ElementalDefinitionContainer_EM.java      |  18 +-
 .../item/ElementalDefinitionScanStorage_EM.java    |   2 +-
 ...GT_MetaTileEntity_Hatch_ElementalContainer.java |   8 +-
 .../GT_MetaTileEntity_Hatch_OutputElemental.java   |   2 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       |  36 +-
 .../multi/GT_MetaTileEntity_EM_decay.java          |   8 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |  10 +-
 .../multi/GT_MetaTileEntity_EM_junction.java       |   6 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |  14 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        |  10 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |  16 +-
 .../multi/em_machine/Behaviour_Centrifuge.java     |   8 +-
 .../multi/em_machine/Behaviour_Electrolyzer.java   |   2 +-
 .../Behaviour_ElectromagneticSeparator.java        |   6 +-
 .../multi/em_machine/Behaviour_PrecisionLaser.java |   2 +-
 .../multi/em_machine/Behaviour_Recycler.java       |   2 +-
 .../multi/em_machine/Behaviour_Scanner.java        |   2 +-
 .../em_machine/GT_MetaTileEntity_EM_machine.java   |   6 +-
 69 files changed, 1360 insertions(+), 1779 deletions(-)
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java

diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index fd039a0630..e027c83107 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -1,9 +1,8 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret;
 
-import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
@@ -16,7 +15,6 @@ import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
 
 /**
  * Created by Bass on 27/07/2017.
@@ -54,7 +52,7 @@ public class TileTurretHeadEM extends TurretHead{
 
     @Override
     public boolean requiresAmmo() {
-        return hatchContentPointer == null || !hatchContentPointer.hasStacks();
+        return hatchContentPointer == null || hatchContentPointer.isEmpty();
     }
 
     @Override
@@ -69,20 +67,15 @@ public class TileTurretHeadEM extends TurretHead{
 
     @Override
     public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) {
-        while(hatchContentPointer!=null && hatchContentPointer.hasStacks()) {
-            cElementalInstanceStack stack = hatchContentPointer.get(TecTech.RANDOM.nextInt(hatchContentPointer.size()));
-            if(stack.amount<AVOGADRO_CONSTANT_DIMINISHED){
-                TecTech.anomalyHandler.addAnomaly(this,hatchContentPointer.remove(stack.definition).getMass());//todo reduce
-                continue;
-            }
-            hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
-            stack=stack.clone();
-            stack.amount = AVOGADRO_CONSTANT;
-            return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
+        if (hatchContentPointer == null || hatchContentPointer.isEmpty()) {
+            return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
         }
-        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
-
-        //todo make the recipe require some overflow hatches
+        cElementalInstanceStack stack = hatchContentPointer.getRandom();
+        double amount = Math.min(AVOGADRO_CONSTANT,stack.amount);
+        hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+        stack=stack.clone();
+        stack.amount = amount;
+        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index a31ba4ef2c..a5d64fb886 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import cpw.mods.fml.common.Optional;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -63,6 +63,6 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
 
     private cElementalInstanceStackMap getFromHatch(GT_MetaTileEntity_Hatch_InputElemental hatch) {
         hatch.updateTexture((byte) 8,(byte) 4);
-        return hatch.getContainerHandler();
+        return hatch.getContentHandler();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
index 8f570c1247..98ad5bbf63 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
 import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -18,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -31,37 +31,27 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
 
     private static final byte nbtType = (byte) 'c';
 
-    private final cElementalDefinitionStackMap aspectStacks;
-
-    @Deprecated
-    public dComplexAspectDefinition(cElementalDefinition... aspects) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(aspects));
-    }
-
-    @Deprecated
-    private dComplexAspectDefinition(boolean check, cElementalDefinition... aspects) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(aspects));
-    }
+    private final cElementalConstantStackMap aspectStacks;
 
     public dComplexAspectDefinition(cElementalDefinitionStack... aspects) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(aspects));
+        this(true, new cElementalConstantStackMap(aspects));
     }
 
     private dComplexAspectDefinition(boolean check, cElementalDefinitionStack... aspects) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(aspects));
+        this(check, new cElementalConstantStackMap(aspects));
     }
 
-    public dComplexAspectDefinition(cElementalDefinitionStackMap aspects) throws tElementalException {
+    public dComplexAspectDefinition(cElementalConstantStackMap aspects) throws tElementalException {
         this(true, aspects);
     }
 
-    private dComplexAspectDefinition(boolean check, cElementalDefinitionStackMap aspects) throws tElementalException {
+    private dComplexAspectDefinition(boolean check, cElementalConstantStackMap aspects) throws tElementalException {
         if (check && !canTheyBeTogether(aspects)) {
             throw new tElementalException("Hadron Definition error");
         }
         aspectStacks = aspects;
         float mass = 0;
-        for (cElementalDefinitionStack stack : aspects.values()) {
+        for (cElementalDefinitionStack stack : aspects.valuesToArray()) {
             mass += stack.getMass();
         }
         this.mass = mass;
@@ -69,9 +59,9 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     }
 
     //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
+    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
         long amount = 0;
-        for (cElementalDefinitionStack aspects : stacks.values()) {
+        for (cElementalDefinitionStack aspects : stacks.valuesToArray()) {
             if (!(aspects.definition instanceof dComplexAspectDefinition) && !(aspects.definition instanceof ePrimalAspectDefinition)) {
                 return false;
             }
@@ -97,7 +87,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     @Override
     public String getSymbol() {
         StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.values()) {
+        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
             if (aspect.definition instanceof ePrimalAspectDefinition) {
                 for (int i = 0; i < aspect.amount; i++) {
                     symbol.append(aspect.definition.getSymbol());
@@ -116,7 +106,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     @Override
     public String getShortSymbol() {
         StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.values()) {
+        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
             if (aspect.definition instanceof ePrimalAspectDefinition) {
                 for (int i = 0; i < aspect.amount; i++) {
                     symbol.append(aspect.definition.getShortSymbol());
@@ -137,10 +127,10 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
         return getNbtTagCompound(nbtType, aspectStacks);
     }
 
-    public static NBTTagCompound getNbtTagCompound(byte nbtType, cElementalDefinitionStackMap aspectStacks) {
+    public static NBTTagCompound getNbtTagCompound(byte nbtType, cElementalConstantStackMap aspectStacks) {
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setByte("t", nbtType);
-        cElementalDefinitionStack[] quarkStacksValues = aspectStacks.values();
+        cElementalDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
         nbt.setInteger("i", quarkStacksValues.length);
         for (int i = 0; i < quarkStacksValues.length; i++) {
             nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
@@ -189,7 +179,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     }
 
     @Override
-    public cElementalDefinitionStackMap getSubParticles() {
+    public cElementalConstantStackMap getSubParticles() {
         return aspectStacks;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
index 9c6d107bff..5db067a552 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index c11a68b5d0..c939f10d6b 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
@@ -94,12 +94,12 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             return false;
         }
 
-        cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContainerHandler();
+        cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContentHandler();
         if (inputHatchContainer == null || !inputHatchContainer.hasStacks()) {
             return false;
         }
 
-        cElementalInstanceStack stack = inputHatchContainer.get(TecTech.RANDOM.nextInt(inputHatchContainer.size()));
+        cElementalInstanceStack stack = inputHatchContainer.getRandom();
         if (stack.amount < AVOGADRO_CONSTANT_DIMINISHED) {
             cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
             mEUt = (int) -V[6];
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 74dff47aa4..62ac339155 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
@@ -108,7 +108,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
             stopMachine();
             return;
         }
-        eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]);
+        eOutputHatches.get(0).getContentHandler().putUnifyAll(outputEM[0]);
         outputEM = null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java
deleted file mode 100644
index e67f773a86..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cElementalDecay {
-    public static final cElementalDecay[] noDecay = null;
-    //DECAY IMPOSSIBLE!!!
-    //Do not use regular NULL java will not make it work with varargs!!!
-    //Or cast null into ARRAY type but this static is more convenient!!!
-    public static final cElementalDecay[] noProduct = new cElementalDecay[0];
-    //this in turn can be used to tell that the thing should just vanish
-    public final cElementalDefinitionStackMap outputStacks;
-    public final double probability;
-
-    public cElementalDecay(iElementalDefinition... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, iElementalDefinition... outSafe) {
-        cElementalDefinitionStack[] outArr = new cElementalDefinitionStack[outSafe.length];
-        for (int i = 0; i < outArr.length; i++) {
-            outArr[i] = new cElementalDefinitionStack(outSafe[i], 1D);
-        }
-        outputStacks = new cElementalDefinitionStackMap(outArr);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalDefinitionStack... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, cElementalDefinitionStack... out) {
-        outputStacks = new cElementalDefinitionStackMap(out);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalDefinitionStackMap tree) {
-        this(1D, tree);
-    }
-
-    public cElementalDecay(double probability, cElementalDefinitionStackMap tree) {
-        outputStacks = tree;
-        this.probability = probability;
-    }
-
-    public cElementalInstanceStackMap getResults(double lifeMult, double age, long energyTotalForProducts, double amountDecaying) {
-        cElementalInstanceStackMap decayResult = new cElementalInstanceStackMap();
-        if (outputStacks == null) {
-            return decayResult;//This is to prevent null pointer exceptions.
-        }
-        //Deny decay code is in instance!
-        double qtty = 0D;
-        for (cElementalDefinitionStack stack : outputStacks.values()) {
-            qtty= add(qtty,stack.amount);
-        }
-        if (qtty <= 0D) {
-            return decayResult;
-        }
-        //energyTotalForProducts /= qtty;
-        //lifeMult /= (float) qtty;
-        for (cElementalDefinitionStack stack : outputStacks.values()) {
-            decayResult.putUnify(new cElementalInstanceStack(stack.definition,
-                    amountDecaying * stack.amount,
-                    lifeMult, age/*new products*/, (long)(energyTotalForProducts / Math.max(1D, Math.abs(stack.amount)))));//get instances from stack
-        }
-        return decayResult;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java
deleted file mode 100644
index 4ca63d14fe..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-public class cElementalDecayResult {
-    private final cElementalInstanceStackMap output;
-    private double massAffected;
-    private double massDiff;
-
-    public cElementalDecayResult(cElementalInstanceStackMap output, double massAffected, double massDiff) {
-        this.output = output;
-        this.massAffected = massAffected;
-        this.massDiff = massDiff;
-    }
-
-    public cElementalInstanceStackMap getOutput() {
-        return output;
-    }
-
-    /**
-     * How much was lost in the process (decayed or removed)
-     * @return
-     */
-    public double getMassAffected() {
-        return massAffected;
-    }
-
-    /**
-     * Difference of mass of actually decayed elements
-     * @return
-     */
-    public double getMassDiff() {
-        return massDiff;
-    }
-
-    public void setMassAffected(double massAffected) {
-        this.massAffected = massAffected;
-    }
-
-    public void setMassDiff(double massDiff) {
-        this.massDiff = massDiff;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java
deleted file mode 100644
index ce0840bc8b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-public final class cElementalDefinitionStackMap/*IMMUTABLE*/ extends cElementalStackMap {//Target class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public static final cElementalDefinitionStackMap EMPTY = new cElementalDefinitionStackMap();
-
-    private cElementalDefinitionStackMap() {
-        map = new TreeMap<>();
-    }
-
-    @Deprecated
-    public cElementalDefinitionStackMap(iElementalDefinition... in) {
-        map=new cElementalMutableDefinitionStackMap(in).map;
-    }
-
-    public cElementalDefinitionStackMap(cElementalDefinitionStack... in) {
-        map=new cElementalMutableDefinitionStackMap(in).map;
-    }
-
-    public cElementalDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        map = new TreeMap<>(in);
-    }
-
-    cElementalDefinitionStackMap(cElementalMutableDefinitionStackMap unsafeMap){
-        map=unsafeMap.map;
-    }
-
-    //IMMUTABLE DON'T NEED IT
-    @Override
-    public cElementalDefinitionStackMap clone() {
-        return this;
-    }
-
-    public cElementalMutableDefinitionStackMap toMutable() {
-        return new cElementalMutableDefinitionStackMap(map);
-    }
-
-    @Override
-    @Deprecated//BETTER TO JUST MAKE A MUTABLE VERSION AND DO SHIT ON IT
-    public TreeMap<iElementalDefinition, cElementalDefinitionStack> getRawMap() {
-        return toMutable().getRawMap();
-    }
-
-    public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalDefinitionStackMap(defStacks);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
deleted file mode 100644
index e1fdc6a553..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
+++ /dev/null
@@ -1,565 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.*;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.util.DoubleCount.add;
-import static com.github.technus.tectech.util.DoubleCount.sub;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalInstanceStackMap implements Comparable<cElementalInstanceStackMap> {
-    TreeMap<iElementalDefinition, cElementalInstanceStack> map;
-
-    //Constructors
-    public cElementalInstanceStackMap() {
-        map = new TreeMap<>();
-    }
-
-    public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) {
-        this(true, inSafe);
-    }
-
-    public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) {
-        map = new TreeMap<>();
-        if (clone) {
-            cElementalInstanceStack[] stacks=new cElementalInstanceStack[in.length];
-            for(int i=0;i<stacks.length;i++) {
-                stacks[i] = in[i].clone();
-            }
-            putUnifyAll(stacks);
-        } else {
-            putUnifyAll(in);
-        }
-    }
-
-    @Deprecated
-    private cElementalInstanceStackMap(TreeMap<iElementalDefinition, cElementalInstanceStack> inSafe) {
-        this(true, inSafe);
-    }
-
-    @Deprecated
-    private cElementalInstanceStackMap(boolean clone, TreeMap<iElementalDefinition, cElementalInstanceStack> in) {
-        if (clone) {
-            map = new TreeMap<>();
-            for(cElementalInstanceStack stack:in.values()) {
-                putUnify(stack.clone());
-            }
-        } else {
-            map = in;
-        }
-    }
-
-    public cElementalInstanceStackMap(cElementalInstanceStackMap inSafe) {
-        this(true, inSafe.map);
-    }
-
-    public cElementalInstanceStackMap(boolean copy, cElementalInstanceStackMap in) {
-        this(copy, in.map);
-    }
-
-    @Override
-    public cElementalInstanceStackMap clone() {
-        return new cElementalInstanceStackMap(map);
-    }
-
-    public cElementalMutableDefinitionStackMap toDefinitionMapForComparison() {
-        cElementalDefinitionStack[] list = new cElementalDefinitionStack[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack stack : map.values()) {
-            list[i++] = new cElementalDefinitionStack(stack.definition, stack.amount);
-        }
-        return new cElementalMutableDefinitionStackMap(list);
-    }
-
-    //@Deprecated
-    //public cElementalStackMap toDefinitionMap(boolean mutable) {
-    //    TreeMap<iElementalDefinition, cElementalDefinitionStack> newMap = new TreeMap<>();
-    //    for (cElementalInstanceStack stack : map.values()) {
-    //        newMap.put(stack.definition, new cElementalDefinitionStack(stack.definition, stack.amount));
-    //    }
-    //    if (mutable) {
-    //        return new cElementalMutableDefinitionStackMap(newMap);
-    //    }
-    //    return new cElementalDefinitionStackMap(newMap);
-    //}
-
-    @Deprecated
-    public Map<iElementalDefinition, cElementalInstanceStack> getRawMap() {
-        return map;
-    }
-
-    public Set<Map.Entry<iElementalDefinition, cElementalInstanceStack>> getEntrySet() {
-        return map.entrySet();
-    }
-
-
-    //Removers
-    public void clear() {
-        map.clear();
-    }
-
-    public cElementalInstanceStack remove(iElementalDefinition def) {
-        return map.remove(def);
-    }
-
-    @Deprecated
-    public cElementalInstanceStack remove(iHasElementalDefinition has) {
-        return map.remove(has.getDefinition());
-    }
-
-    public void removeAll(iElementalDefinition... definitions) {
-        for (iElementalDefinition def : definitions) {
-            map.remove(def);
-        }
-    }
-
-    @Deprecated
-    private void removeAll(iHasElementalDefinition... hasElementalDefinition) {
-        for (iHasElementalDefinition has : hasElementalDefinition) {
-            map.remove(has.getDefinition());
-        }
-    }
-
-    //Remove amounts
-    public boolean removeAmount(boolean testOnly, cElementalInstanceStack instance) {
-        cElementalInstanceStack target = map.get(instance.definition);
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= instance.amount;
-        } else {
-            double diff = sub(target.amount,instance.amount);
-            if (diff > 0) {
-                target.amount = diff;
-                return true;
-            } else if (diff == 0) {
-                map.remove(instance.definition);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean removeAmount(boolean testOnly, iHasElementalDefinition stack) {
-        cElementalInstanceStack target = map.get(stack.getDefinition());
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= stack.getAmount();
-        } else {
-            double diff = sub(target.amount,stack.getAmount());
-            if (diff > 0) {
-                target.amount = diff;
-                return true;
-            } else if (diff == 0) {
-                map.remove(stack.getDefinition());
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Deprecated
-    public boolean removeAmount(boolean testOnly, iElementalDefinition def) {
-        return removeAmount(testOnly, new cElementalDefinitionStack(def, 1D));
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStack... instances) {
-        boolean test = true;
-        for (cElementalInstanceStack stack : instances) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (cElementalInstanceStack stack : instances) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, iHasElementalDefinition... stacks) {
-        boolean test = true;
-        for (iHasElementalDefinition stack : stacks) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (iHasElementalDefinition stack : stacks) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    @Deprecated
-    public boolean removeAllAmounts(boolean testOnly, iElementalDefinition... definitions) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[definitions.length];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = new cElementalDefinitionStack(definitions[i], 1);
-        }
-        return removeAllAmounts(testOnly, stacks);
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    //Remove overflow
-    public double removeOverflow(int stacksCount, double stackCapacity) {
-        double massRemoved = 0;
-
-        if (map.size() > stacksCount) {
-            iElementalDefinition[] keys = keys();
-            for (int i = stacksCount; i < keys.length; i++) {
-                massRemoved += map.get(keys[i]).getDefinitionStack().getMass();
-                map.remove(keys[i]);
-            }
-        }
-
-        for (cElementalInstanceStack instance : values()) {
-            if (instance.amount > stackCapacity) {
-                massRemoved += instance.definition.getMass() * (instance.amount - stackCapacity);
-                instance.amount = stackCapacity;
-            }
-        }
-        return massRemoved;
-    }
-
-    //Put replace
-    public cElementalInstanceStack putReplace(cElementalInstanceStack instanceUnsafe) {
-        return map.put(instanceUnsafe.definition, instanceUnsafe);
-    }
-
-    public void putReplaceAll(cElementalInstanceStack... instances) {
-        for (cElementalInstanceStack instance : instances) {
-            map.put(instance.definition, instance);
-        }
-    }
-
-    private void putReplaceAll(Map<iElementalDefinition, cElementalInstanceStack> inTreeUnsafe) {
-        map.putAll(inTreeUnsafe);
-    }
-
-    public void putReplaceAll(cElementalInstanceStackMap inContainerUnsafe) {
-        putReplaceAll(inContainerUnsafe.map);
-    }
-
-    //Put unify
-    public cElementalInstanceStack putUnify(cElementalInstanceStack instance) {
-        cElementalInstanceStack stack=map.get(instance.definition);
-        if(stack==null) {
-            return map.put(instance.definition, instance);
-        }
-        return map.put(instance.definition, stack.unifyIntoThis(instance));
-    }
-
-    public void putUnifyAll(cElementalInstanceStack... instances) {
-        for (cElementalInstanceStack instance : instances) {
-            putUnify(instance);
-        }
-    }
-
-    private void putUnifyAll(Map<iElementalDefinition, cElementalInstanceStack> inTreeUnsafe) {
-        for (cElementalInstanceStack in : inTreeUnsafe.values()) {
-            putUnify(in);
-        }
-    }
-
-    public void putUnifyAll(cElementalInstanceStackMap containerUnsafe) {
-        putUnifyAll(containerUnsafe.map);
-    }
-
-    //Getters
-    public cElementalInstanceStack getFirst(){
-        return map.firstEntry().getValue();
-    }
-
-    public cElementalInstanceStack getLast(){
-        return map.lastEntry().getValue();
-    }
-
-    public cElementalInstanceStack getInstance(iElementalDefinition def) {
-        return map.get(def);
-    }
-
-    public cElementalInstanceStack get(int i){
-        Collection<cElementalInstanceStack> var = map.values();
-        return var.toArray(new cElementalInstanceStack[0])[i];
-    }
-
-    public String[] getShortSymbolsInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            info[i++] = instance.definition.getShortSymbol();
-        }
-        return info;
-    }
-
-    public String[] getElementalInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName()+
-                    " "+ EnumChatFormatting.AQUA + instance.definition.getSymbol()+ EnumChatFormatting.RESET+
-                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E",instance.amount/ AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
-                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
-                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
-        }
-        return info;
-    }
-
-    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanShortSymbols(list,capabilities);
-        }
-        return list;
-    }
-
-    public ArrayList<String> getScanInfo(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanResults(list,capabilities);
-        }
-        return list;
-    }
-
-    public cElementalInstanceStack[] values() {
-        Collection<cElementalInstanceStack> var = map.values();
-        return var.toArray(new cElementalInstanceStack[0]);
-    }
-
-    public iElementalDefinition[] keys() {
-        Set<iElementalDefinition> var = map.keySet();
-        return var.toArray(new iElementalDefinition[0]);
-    }
-
-    public double getMass() {
-        double mass = 0;
-        for (cElementalInstanceStack stack : map.values()) {
-            mass += stack.getMass();
-        }
-        return mass;
-    }
-
-    public double getCharge() {
-        double charge = 0;
-        for (cElementalInstanceStack stack : map.values()) {
-            charge += stack.getCharge();
-        }
-        return charge;
-    }
-
-    public double getCountOfAllAmounts(){
-        double sum=0;
-        for(cElementalInstanceStack stack:map.values()){
-            sum= add(sum,stack.amount);
-        }
-        return sum;
-    }
-
-    //Tests
-    public boolean containsDefinition(iElementalDefinition def) {
-        return map.containsKey(def);
-    }
-
-    public boolean containsInstance(cElementalInstanceStack inst) {
-        return map.containsValue(inst);
-    }
-
-    public int size() {
-        return map.size();
-    }
-
-    public boolean hasStacks() {
-        return !map.isEmpty();
-    }
-
-    public boolean isEmpty(){
-        return map.isEmpty();
-    }
-
-    //Tick Content
-    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
-        return tickContent(lifeTimeMult,postEnergize,1D);
-    }
-
-    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
-        cleanUp();
-        double diff=0;
-        for (cElementalInstanceStack instance : values()) {
-            cElementalDecayResult newInstances = instance.decay(lifeTimeMult, instance.age += seconds, postEnergize);
-            if (newInstances == null) {
-                instance.nextColor();
-            } else {
-                diff=add(diff,newInstances.getMassDiff());
-                removeAmount(false,instance);
-                putUnifyAll(newInstances.getOutput());
-            }
-        }
-        return diff;
-    }
-
-    //NBT
-    public NBTTagCompound getShortSymbolsNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getShortSymbolsInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getInfoNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getElementalInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanShortSymbols(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanInfo(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger("i", map.size());
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            nbt.setTag(Integer.toString(i++), instance.toNBT());
-        }
-        return nbt;
-    }
-
-    public static cElementalInstanceStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalInstanceStack[] instances = new cElementalInstanceStack[nbt.getInteger("i")];
-        for (int i = 0; i < instances.length; i++) {
-            instances[i] = cElementalInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (instances[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalInstanceStackMap(false, instances);
-    }
-
-    //stackUp
-    public static cElementalInstanceStack[] stackUp(cElementalInstanceStack... in) {
-        cElementalInstanceStackMap inTree = new cElementalInstanceStackMap();
-        inTree.putUnifyAll(in);
-        return inTree.values();
-    }
-
-    @Override
-    public int compareTo(cElementalInstanceStackMap o) {
-        int sizeDiff = map.size() - o.map.size();
-        if (sizeDiff != 0) {
-            return sizeDiff;
-        }
-        cElementalInstanceStack[] ofThis = values(), ofThat = o.values();
-        for (int i = 0; i < ofThat.length; i++) {
-            int result = ofThis[i].compareTo(ofThat[i]);
-            if (result != 0) {
-                return result;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo((cElementalInstanceStackMap) obj) == 0;
-        }
-        if (obj instanceof cElementalStackMap) {
-            return toDefinitionMapForComparison().compareTo((cElementalStackMap) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Hash only definitions to compare contents not amounts or data
-        int hash = -(map.size() << 4);
-        for (cElementalInstanceStack stack : map.values()) {
-            hash += stack.definition.hashCode();
-        }
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder build=new StringBuilder("Instance Stack Map\n");
-        for(cElementalInstanceStack stack:map.values()){
-            build.append(stack.toString()).append('\n');
-        }
-        return build.toString();
-    }
-
-    public cElementalInstanceStackMap takeAllToNewMap(){
-        TreeMap<iElementalDefinition, cElementalInstanceStack> map=this.map;
-        this.map=new TreeMap<>();
-        return new cElementalInstanceStackMap(map);
-    }
-
-    public void cleanUp(){
-        map.entrySet().removeIf(entry -> entry.getValue().amount < AVOGADRO_CONSTANT_UNCERTAINTY);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
deleted file mode 100644
index 020f5a5f8c..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.util.DoubleCount.sub;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalMutableDefinitionStackMap extends cElementalStackMap {//Transient class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public cElementalMutableDefinitionStackMap() {
-        map = new TreeMap<>();
-    }
-
-    @Deprecated
-    public cElementalMutableDefinitionStackMap(iElementalDefinition... in) {
-        map=new TreeMap<>();
-        for (iElementalDefinition def : in) {
-            putUnify(new cElementalDefinitionStack(def, 1));
-        }
-    }
-
-    public cElementalMutableDefinitionStackMap(cElementalDefinitionStack... in) {
-        map=new TreeMap<>();
-        putUnifyAll(in);
-    }
-
-    public cElementalMutableDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        this(true, in);
-    }
-
-    public cElementalMutableDefinitionStackMap(boolean clone, TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        if (clone) {
-            map = new TreeMap<>(in);
-        } else {
-            map = in;
-        }
-    }
-
-    @Override
-    public cElementalMutableDefinitionStackMap clone() {
-        return new cElementalMutableDefinitionStackMap(map);
-    }
-
-    public cElementalDefinitionStackMap toImmutable() {
-        return new cElementalDefinitionStackMap(map);
-    }
-    public cElementalDefinitionStackMap toImmutable_optimized_unsafeLeavesExposedElementalTree() {
-        return new cElementalDefinitionStackMap(this);
-    }
-
-    @Override
-    @Deprecated
-    public TreeMap<iElementalDefinition, cElementalDefinitionStack> getRawMap() {
-        return map;
-    }
-
-
-    //Removers
-    public void clear() {
-        map.clear();
-    }
-
-    public cElementalDefinitionStack remove(iElementalDefinition def) {
-        return map.remove(def);
-    }
-
-    @Deprecated
-    public cElementalDefinitionStack remove(iHasElementalDefinition has) {
-        return map.remove(has.getDefinition());
-    }
-
-    public void removeAll(iElementalDefinition... definitions) {
-        for (iElementalDefinition def : definitions) {
-            map.remove(def);
-        }
-    }
-
-    @Deprecated
-    public void removeAll(iHasElementalDefinition... hasElementalDefinition) {
-        for (iHasElementalDefinition has : hasElementalDefinition) {
-            map.remove(has.getDefinition());
-        }
-    }
-
-    //Remove amounts
-    public boolean removeAmount(boolean testOnly, cElementalInstanceStack instance) {
-        cElementalDefinitionStack target = map.get(instance.definition);
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= instance.amount;
-        } else {
-            double diff = sub(target.amount,instance.amount);
-            if (diff > 0) {
-                map.put(target.definition, new cElementalDefinitionStack(target.definition, diff));
-                return true;
-            } else if (diff == 0) {
-                map.remove(instance.definition);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean removeAmount(boolean testOnly, iHasElementalDefinition stack) {
-        cElementalDefinitionStack target = map.get(stack.getDefinition());
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= stack.getAmount();
-        } else {
-            double diff = sub(target.amount,stack.getAmount());
-            if (diff > 0) {
-                map.put(target.definition, new cElementalDefinitionStack(target.definition, diff));
-                return true;
-            } else if (diff == 0) {
-                map.remove(stack.getDefinition());
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Deprecated
-    public boolean removeAmount(boolean testOnly, iElementalDefinition def) {
-        return removeAmount(testOnly, new cElementalDefinitionStack(def, 1));
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStack... instances) {
-        boolean test = true;
-        for (cElementalInstanceStack stack : instances) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (cElementalInstanceStack stack : instances) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, iHasElementalDefinition... stacks) {
-        boolean test = true;
-        for (iHasElementalDefinition stack : stacks) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (iHasElementalDefinition stack : stacks) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    @Deprecated
-    public boolean removeAllAmounts(boolean testOnly, iElementalDefinition... definitions) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[definitions.length];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = new cElementalDefinitionStack(definitions[i], 1);
-        }
-        return removeAllAmounts(testOnly, stacks);
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    //Put replace
-    public cElementalDefinitionStack putReplace(cElementalDefinitionStack defStackUnsafe) {
-        return map.put(defStackUnsafe.definition, defStackUnsafe);
-    }
-
-    public void putReplaceAll(cElementalDefinitionStack... defStacks) {
-        for (cElementalDefinitionStack defStack : defStacks) {
-            map.put(defStack.definition, defStack);
-        }
-    }
-
-    public void putReplaceAll(cElementalStackMap inContainerUnsafe) {
-        map.putAll(inContainerUnsafe.map);
-    }
-
-    //Put unify
-    public cElementalDefinitionStack putUnify(cElementalDefinitionStack def) {
-        cElementalDefinitionStack stack=map.get(def.definition);
-        if(stack==null) {
-            return map.put(def.definition, def);
-        }
-        return map.put(def.definition, stack.addAmountIntoNewInstance(def.amount));
-    }
-
-    @Deprecated
-    public cElementalDefinitionStack putUnify(iElementalDefinition def) {
-        return putUnify(new cElementalDefinitionStack(def, 1));
-    }
-
-    public void putUnifyAll(cElementalDefinitionStack... defs) {
-        for (cElementalDefinitionStack def : defs) {
-            putUnify(def);
-        }
-    }
-
-    @Deprecated
-    public void putUnifyAll(iElementalDefinition... defs) {
-        for (iElementalDefinition def : defs) {
-            putUnify(def);
-        }
-    }
-
-    private void putUnifyAll(Map<iElementalDefinition, cElementalDefinitionStack> inTreeUnsafe) {
-        for (cElementalDefinitionStack in : inTreeUnsafe.values()) {
-            putUnify(in);
-        }
-    }
-
-    public void putUnifyAll(cElementalStackMap containerUnsafe) {
-        for (cElementalDefinitionStack in : containerUnsafe.map.values()) {
-            putUnify(in);
-        }
-    }
-
-    public static cElementalMutableDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalMutableDefinitionStackMap(defStacks);
-    }
-
-    public void cleanUp(){
-        for(Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry:map.entrySet()){
-            if(entry.getValue().amount<=0) {
-                map.remove(entry.getKey());
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java
deleted file mode 100644
index f8e7aa39e4..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-abstract class cElementalStackMap implements Comparable<cElementalStackMap> {
-    protected TreeMap<iElementalDefinition, cElementalDefinitionStack> map;
-
-    @Override
-    public abstract cElementalStackMap clone();
-
-    @Deprecated
-    public abstract TreeMap<iElementalDefinition, cElementalDefinitionStack> getRawMap();
-
-    //Getters
-    public final cElementalDefinitionStack getFirst(){
-        return map.firstEntry().getValue();
-    }
-
-    public final cElementalDefinitionStack getLast(){
-        return map.lastEntry().getValue();
-    }
-
-    public final cElementalDefinitionStack getDefinitionStack(iElementalDefinition def) {
-        return map.get(def);
-    }
-
-    public String[] getShortSymbolsInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalDefinitionStack instance : map.values()) {
-            info[i++] = instance.definition.getShortSymbol();
-        }
-        return info;
-    }
-
-    public final String[] getElementalInfo() {
-        String[] info = new String[map.size() * 3];
-        int i = 0;
-        for (cElementalDefinitionStack defStack : map.values()) {
-            info[i] = EnumChatFormatting.BLUE + defStack.definition.getName();
-            info[i + 1] = EnumChatFormatting.AQUA + defStack.definition.getSymbol();
-            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.amount;
-            i += 3;
-        }
-        return info;
-    }
-
-    public final cElementalDefinitionStack[] values() {
-        Collection<cElementalDefinitionStack> var = map.values();
-        return var.toArray(new cElementalDefinitionStack[0]);
-    }
-
-    public final iElementalDefinition[] keys() {
-        Set<iElementalDefinition> var = map.keySet();
-        return var.toArray(new iElementalDefinition[0]);
-    }
-
-    public double getCountOfAllAmounts(){
-        double sum=0;
-        for(cElementalDefinitionStack stack:map.values()){
-            sum= add(sum,stack.amount);
-        }
-        return sum;
-    }
-
-    //Tests
-    public final boolean containsDefinition(iElementalDefinition def) {
-        return map.containsKey(def);
-    }
-
-    public final boolean containsDefinitionStack(cElementalDefinitionStack inst) {
-        return map.containsValue(inst);
-    }
-
-    public final int size() {
-        return map.size();
-    }
-
-    public final boolean hasStacks() {
-        return !map.isEmpty();
-    }
-
-    public final boolean isEmpty(){
-        return map.isEmpty();
-    }
-
-    //NBT
-    public final NBTTagCompound getShortSymbolsNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getShortSymbolsInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public final NBTTagCompound getInfoNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getElementalInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger("i", map.size());
-        int i = 0;
-        for (cElementalDefinitionStack defStack : map.values()) {
-            nbt.setTag(Integer.toString(i++), defStack.toNBT());
-        }
-        return nbt;
-    }
-
-    @Override
-    public final int compareTo(cElementalStackMap o) {//this actually compares rest
-        int sizeDiff = map.size() - o.map.size();
-        if (sizeDiff != 0) {
-            return sizeDiff;
-        }
-        cElementalDefinitionStack[] ofThis = values(), ofO = o.values();
-        for (int i = 0; i < ofO.length; i++) {
-            int result = ofThis[i].compareTo(ofO[i]);
-            if (result != 0) {
-                return result;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalStackMap) {
-            return compareTo((cElementalStackMap) obj) == 0;
-        }
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo(((cElementalInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public final int hashCode() {//Hash only definitions to compare contents not amounts or data
-        int hash = -(map.size() << 4);
-        for (cElementalDefinitionStack stack : map.values()) {
-            hash += stack.definition.hashCode();
-        }
-        return hash;
-    }
-
-    public double getMass(){
-        double mass=0;
-        for(cElementalDefinitionStack stack:map.values()){
-            mass+=stack.getMass();
-        }
-        return mass;
-    }
-
-    public long getCharge(){
-        long charge=0;
-        for(cElementalDefinitionStack stack:map.values()){
-            charge+=stack.getCharge();
-        }
-        return charge;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
index 912d44ff43..8b1f6d0c14 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -83,7 +83,7 @@ public class GiveEM implements ICommand {
             byte clazz = (byte) args.remove(0).charAt(0);
             Method constructor = cElementalDefinition.getBindsComplex().get(clazz);
 
-            cElementalMutableDefinitionStackMap stacks=new cElementalMutableDefinitionStackMap();
+            cElementalDefinitionStackMap stacks =new cElementalDefinitionStackMap();
             while(args.size()>0){
                 cElementalDefinitionStack tempStack=getDefinitionStack(args);
                 if(tempStack==null) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
new file mode 100644
index 0000000000..79103f7fa0
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
@@ -0,0 +1,77 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import static com.github.technus.tectech.util.DoubleCount.add;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class cElementalDecay {
+    public static final cElementalDecay[] noDecay = null;
+    //DECAY IMPOSSIBLE!!!
+    //Do not use regular NULL java will not make it work with varargs!!!
+    //Or cast null into ARRAY type but this static is more convenient!!!
+    public static final cElementalDecay[]          noProduct = new cElementalDecay[0];
+    //this in turn can be used to tell that the thing should just vanish
+    public final        cElementalConstantStackMap outputStacks;
+    public final        double                     probability;
+
+    public cElementalDecay(iElementalDefinition... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public cElementalDecay(double probability, iElementalDefinition... outSafe) {
+        cElementalDefinitionStack[] outArr = new cElementalDefinitionStack[outSafe.length];
+        for (int i = 0; i < outArr.length; i++) {
+            outArr[i] = new cElementalDefinitionStack(outSafe[i], 1D);
+        }
+        outputStacks = new cElementalConstantStackMap(outArr);
+        this.probability = probability;
+    }
+
+    public cElementalDecay(cElementalDefinitionStack... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public cElementalDecay(double probability, cElementalDefinitionStack... out) {
+        outputStacks = new cElementalConstantStackMap(out);
+        this.probability = probability;
+    }
+
+    public cElementalDecay(cElementalConstantStackMap tree) {
+        this(1D, tree);
+    }
+
+    public cElementalDecay(double probability, cElementalConstantStackMap tree) {
+        outputStacks = tree;
+        this.probability = probability;
+    }
+
+    public cElementalInstanceStackMap getResults(double lifeMult, double age, long energyTotalForProducts, double amountDecaying) {
+        cElementalInstanceStackMap decayResult = new cElementalInstanceStackMap();
+        if (outputStacks == null) {
+            return decayResult;//This is to prevent null pointer exceptions.
+        }
+        //Deny decay code is in instance!
+        double qtty = 0D;
+        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
+            qtty= add(qtty,stack.amount);
+        }
+        if (qtty <= 0D) {
+            return decayResult;
+        }
+        //energyTotalForProducts /= qtty;
+        //lifeMult /= (float) qtty;
+        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
+            decayResult.putUnify(new cElementalInstanceStack(stack.definition,
+                    amountDecaying * stack.amount,
+                    lifeMult, age/*new products*/, (long)(energyTotalForProducts / Math.max(1D, Math.abs(stack.amount)))));//get instances from stack
+        }
+        return decayResult;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
new file mode 100644
index 0000000000..43f4341720
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
@@ -0,0 +1,43 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+
+public class cElementalDecayResult {
+    private final cElementalInstanceStackMap output;
+    private       double                     massAffected;
+    private       double                     massDiff;
+
+    public cElementalDecayResult(cElementalInstanceStackMap output, double massAffected, double massDiff) {
+        this.output = output;
+        this.massAffected = massAffected;
+        this.massDiff = massDiff;
+    }
+
+    public cElementalInstanceStackMap getOutput() {
+        return output;
+    }
+
+    /**
+     * How much was lost in the process (decayed or removed)
+     * @return
+     */
+    public double getMassAffected() {
+        return massAffected;
+    }
+
+    /**
+     * Difference of mass of actually decayed elements
+     * @return
+     */
+    public double getMassDiff() {
+        return massDiff;
+    }
+
+    public void setMassAffected(double massAffected) {
+        this.massAffected = massAffected;
+    }
+
+    public void setMassDiff(double massDiff) {
+        this.massDiff = massDiff;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
new file mode 100644
index 0000000000..457a37f7b9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
@@ -0,0 +1,12 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+
+/**
+ * Created by danie_000 on 25.01.2017.
+ */
+public interface iElementalContainer {
+    cElementalInstanceStackMap getContentHandler();
+
+    void purgeOverflow();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java
deleted file mode 100644
index 20fe1ffc5b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-/**
- * Created by danie_000 on 25.01.2017.
- */
-public interface iElementalInstanceContainer extends Cloneable {
-    cElementalInstanceStackMap getContainerHandler();
-
-    void purgeOverflow();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
new file mode 100644
index 0000000000..cde1d55561
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
@@ -0,0 +1,58 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.Collections;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+public final class cElementalConstantStackMap/*IMMUTABLE*/ extends cElementalStackMap<cElementalDefinitionStack> {//Target class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public static final cElementalConstantStackMap EMPTY = new cElementalConstantStackMap();
+
+    private cElementalConstantStackMap() {
+        super(Collections.emptyNavigableMap());
+    }
+
+    public cElementalConstantStackMap(cElementalDefinitionStack... in) {
+        this(new cElementalDefinitionStackMap(in).map);
+    }
+
+    public cElementalConstantStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
+        super(Collections.unmodifiableNavigableMap(in));
+    }
+
+    @Override
+    public Class<cElementalDefinitionStack> getType() {
+        return cElementalDefinitionStack.class;
+    }
+
+    //IMMUTABLE DON'T NEED IT
+    @Override
+    public cElementalConstantStackMap clone() {
+        return this;
+    }
+
+    public cElementalDefinitionStackMap toMutable() {
+        return new cElementalDefinitionStackMap(new TreeMap<>(map));
+    }
+
+    public static cElementalConstantStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
+        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].definition.equals(nbtE__)) {
+                throw new tElementalException("Something went Wrong");
+            }
+        }
+        return new cElementalConstantStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
new file mode 100644
index 0000000000..1273119bb3
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
@@ -0,0 +1,56 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class cElementalDefinitionStackMap extends cElementalStackMap<cElementalDefinitionStack> implements iElementalMapRW<cElementalDefinitionStack> {//Transient class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public cElementalDefinitionStackMap() {}
+
+    public cElementalDefinitionStackMap(cElementalDefinitionStack... in) {
+        putUnifyAll(in);
+    }
+
+    public cElementalDefinitionStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
+        super(in);
+    }
+
+    @Override
+    public Class<cElementalDefinitionStack> getType() {
+        return cElementalDefinitionStack.class;
+    }
+
+    @Override
+    public cElementalDefinitionStackMap clone() {
+        return new cElementalDefinitionStackMap(new TreeMap<>(map));
+    }
+
+    public cElementalConstantStackMap toImmutable() {
+        return new cElementalConstantStackMap(new TreeMap<>(map));
+    }
+
+    public cElementalConstantStackMap toImmutable_optimized_unsafe_LeavesExposedElementalTree() {
+        return new cElementalConstantStackMap(map);
+    }
+
+    public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
+        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].definition.equals(nbtE__)) {
+                throw new tElementalException("Something went Wrong");
+            }
+        }
+        return new cElementalDefinitionStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
new file mode 100644
index 0000000000..aab1f93990
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
@@ -0,0 +1,214 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.util.DoubleCount.add;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class cElementalInstanceStackMap extends cElementalStackMap<cElementalInstanceStack> implements iElementalMapRW<cElementalInstanceStack> {
+    //Constructors
+    public cElementalInstanceStackMap() {}
+
+    public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) {
+        this(true, inSafe);
+    }
+
+    public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) {
+        if (clone) {
+            cElementalInstanceStack[] stacks=new cElementalInstanceStack[in.length];
+            for(int i=0;i<stacks.length;i++) {
+                stacks[i] = in[i].clone();
+            }
+            putUnifyAll(stacks);
+        } else {
+            putUnifyAll(in);
+        }
+    }
+
+    private cElementalInstanceStackMap(NavigableMap<iElementalDefinition, cElementalInstanceStack> inSafe) {
+        this(true, inSafe);
+    }
+
+    private cElementalInstanceStackMap(boolean clone, NavigableMap<iElementalDefinition, cElementalInstanceStack> in) {
+        if (clone) {
+            map = new TreeMap<>();
+            for(cElementalInstanceStack stack:in.values()) {
+                putUnify(stack.clone());
+            }
+        } else {
+            map = in;
+        }
+    }
+
+    @Override
+    public Class<cElementalInstanceStack> getType() {
+        return cElementalInstanceStack.class;
+    }
+
+    @Override
+    public cElementalInstanceStackMap clone() {
+        return new cElementalInstanceStackMap(map);
+    }
+
+    //Remove overflow
+    public double removeOverflow(int stacksCount, double stackCapacity) {
+        double massRemoved = 0;
+
+        if (map.size() > stacksCount) {
+            iElementalDefinition[] keys = keySetToArray();
+            for (int i = stacksCount; i < keys.length; i++) {
+                massRemoved += map.get(keys[i]).getDefinitionStack().getMass();
+                map.remove(keys[i]);
+            }
+        }
+
+        for (cElementalInstanceStack instance : valuesToArray()) {
+            if (instance.amount > stackCapacity) {
+                massRemoved += instance.definition.getMass() * (instance.amount - stackCapacity);
+                instance.amount = stackCapacity;
+            }
+        }
+        return massRemoved;
+    }
+
+    //Getters
+    public String[] getElementalInfo() {
+        String[] info = new String[map.size()];
+        int i = 0;
+        for (cElementalInstanceStack instance : map.values()) {
+            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName()+
+                    " "+ EnumChatFormatting.AQUA + instance.definition.getSymbol()+ EnumChatFormatting.RESET+
+                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E",instance.amount/ AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
+                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
+                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
+        }
+        return info;
+    }
+
+    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
+            e.getValue().addScanShortSymbols(list,capabilities);
+        }
+        return list;
+    }
+
+    public ArrayList<String> getScanInfo(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
+            e.getValue().addScanResults(list,capabilities);
+        }
+        return list;
+    }
+
+    //Tick Content
+    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
+        return tickContent(lifeTimeMult,postEnergize,1D);
+    }
+
+    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
+        cleanUp();
+        double diff=0;
+        for (cElementalInstanceStack instance : valuesToArray()) {
+            cElementalDecayResult newInstances = instance.decay(lifeTimeMult, instance.age += seconds, postEnergize);
+            if (newInstances == null) {
+                instance.nextColor();
+            } else {
+                diff=add(diff,newInstances.getMassDiff());
+                removeAmount(false,instance);
+                putUnifyAll(newInstances.getOutput());
+            }
+        }
+        return diff;
+    }
+
+    //NBT
+    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanShortSymbols(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanInfo(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public static cElementalInstanceStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
+        cElementalInstanceStack[] instances = new cElementalInstanceStack[nbt.getInteger("i")];
+        for (int i = 0; i < instances.length; i++) {
+            instances[i] = cElementalInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (instances[i].definition.equals(nbtE__)) {
+                throw new tElementalException("Something went Wrong");
+            }
+        }
+        return new cElementalInstanceStackMap(false, instances);
+    }
+
+    //stackUp
+    public static cElementalInstanceStack[] stackUp(cElementalInstanceStack... in) {
+        cElementalInstanceStackMap inTree = new cElementalInstanceStackMap();
+        inTree.putUnifyAll(in);
+        return inTree.valuesToArray();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof cElementalInstanceStackMap) {
+            return compareTo((cElementalInstanceStackMap) obj) == 0;
+        }
+        if (obj instanceof cElementalStackMap) {
+            return toDefinitionMapForComparison().compareTo((cElementalStackMap) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder build=new StringBuilder("Instance Stack Map\n");
+        for(cElementalInstanceStack stack:map.values()){
+            build.append(stack.toString()).append('\n');
+        }
+        return build.toString();
+    }
+
+    public cElementalInstanceStackMap takeAll(){
+        cElementalInstanceStackMap newStack=new cElementalInstanceStackMap(false,new TreeMap<>(this.map));//just in case to uncouple The map
+        this.map.clear();
+        return newStack;
+    }
+
+    public cElementalDefinitionStackMap toDefinitionMapForComparison() {
+        cElementalDefinitionStack[] list = new cElementalDefinitionStack[size()];
+        int                         i    = 0;
+        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : entrySet()) {
+            cElementalInstanceStack value = entry.getValue();
+            list[i++] = new cElementalDefinitionStack(value.getDefinition(), value.getAmount());
+        }
+        return new cElementalDefinitionStackMap(list);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
new file mode 100644
index 0000000000..2b144df128
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
@@ -0,0 +1,50 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+abstract class cElementalStackMap<T extends iElementalStack> implements iElementalMapR<T> {
+    protected NavigableMap<iElementalDefinition, T> map;
+
+    protected cElementalStackMap() {
+        this(new TreeMap<>());
+    }
+
+    protected cElementalStackMap(NavigableMap<iElementalDefinition, T> map) {
+        this.map = map;
+    }
+
+    @Override
+    public NavigableMap<iElementalDefinition, T> getBackingMap() {
+        return map;
+    }
+
+    @Override
+    public abstract cElementalStackMap<T> clone();
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof cElementalInstanceStackMap) {
+            return compareTo(((cElementalInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
+        }
+        if (obj instanceof cElementalStackMap) {
+            return compareTo((cElementalStackMap) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Hash only definitions to compare contents not amounts or data
+        int hash = -(map.size() << 4);
+        for (T stack : map.values()) {
+            hash += stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
new file mode 100644
index 0000000000..0491c43ebc
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
@@ -0,0 +1,187 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.lang.reflect.Array;
+import java.util.*;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+
+public interface iElementalMapR<T extends iElementalStack> extends Comparable<iElementalMapR<? extends iElementalStack>>, Cloneable {
+    NavigableMap<iElementalDefinition,T> getBackingMap();
+
+    iElementalMapR<T> clone();
+
+    default Set<Map.Entry<iElementalDefinition, T>> entrySet(){
+        return getBackingMap().entrySet();
+    }
+
+    default Set<iElementalDefinition> keySet(){
+        return getBackingMap().keySet();
+    }
+
+    default iElementalDefinition[] keySetToArray() {
+        return keySetToArray(new iElementalDefinition[size()]);
+    }
+
+    default iElementalDefinition[] keySetToArray(iElementalDefinition[] array) {
+        return getBackingMap().keySet().toArray(array);
+    }
+
+    default Collection<T> values(){
+        return getBackingMap().values();
+    }
+
+    @SuppressWarnings("unchecked")
+    default T[] valuesToArray(){
+        return valuesToArray((T[]) Array.newInstance(getType(),size()));
+    }
+
+    default T[] valuesToArray(T[] array){
+        return getBackingMap().values().toArray(array);
+    }
+
+    Class<T> getType();
+
+    //Getters
+    default T getFirst(){
+        return getBackingMap().firstEntry().getValue();
+    }
+
+    default T getLast(){
+        return getBackingMap().lastEntry().getValue();
+    }
+
+    default T get(iElementalDefinition def) {
+        return getBackingMap().get(def);
+    }
+
+    default T getNaturallySorted(int pos) {
+        if(pos<0 || pos>=size()){
+            throw new IndexOutOfBoundsException("Index was: "+pos+" size was: "+size());
+        }
+        for (Map.Entry<iElementalDefinition, T> entry : entrySet()) {
+            if(pos==0){
+                return entry.getValue();
+            }
+            pos--;
+        }
+        return null;
+    }
+
+    default T getRandom() {
+        return getNaturallySorted(TecTech.RANDOM.nextInt(size()));
+    }
+
+    default String[] getShortSymbolsInfo() {
+        String[] info = new String[size()];
+        int i = 0;
+        for (T instance : values()) {
+            info[i++] = instance.getDefinition().getShortSymbol();
+        }
+        return info;
+    }
+
+    default String[] getElementalInfo() {
+        String[] info = new String[size() * 3];
+        int i = 0;
+        for (T defStack : values()) {
+            info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getName();
+            info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
+            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
+            i += 3;
+        }
+        return info;
+    }
+
+    //NBT
+    default NBTTagCompound getShortSymbolsNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getShortSymbolsInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound getInfoNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getElementalInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setInteger("i", size());
+        int i = 0;
+        for (T stack : values()) {
+            nbt.setTag(Integer.toString(i++), stack.toNBT());
+        }
+        return nbt;
+    }
+
+    @Override
+    default int compareTo(iElementalMapR<? extends iElementalStack> o) {//this actually compares rest
+        int sizeDiff = size() - o.size();
+        if (sizeDiff != 0) {
+            return sizeDiff;
+        }
+
+        Iterator<T> iterator = values().iterator();
+        Iterator<? extends iElementalStack> iteratorO = o.values().iterator();
+
+        while (iterator.hasNext()) {
+            int result = iterator.next().compareTo(iteratorO.next());
+            if (result != 0) {
+                return result;
+            }
+        }
+        return 0;
+    }
+
+    default double getMass(){
+        double mass=0;
+        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
+            mass+=entry.getValue().getMass();
+        }
+        return mass;
+    }
+
+    default long getCharge(){
+        long charge=0;
+        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
+            charge+=entry.getValue().getCharge();
+        }
+        return charge;
+    }
+
+    //Tests
+    default boolean containsKey(iElementalDefinition def) {
+        return getBackingMap().containsKey(def);
+    }
+
+    default boolean containsKey(iElementalStack def) {
+        return containsKey(def.getDefinition());
+    }
+
+    default int size() {
+        return getBackingMap().size();
+    }
+
+    default boolean hasStacks() {
+        return !isEmpty();
+    }
+
+    default boolean isEmpty(){
+        return getBackingMap().isEmpty();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
new file mode 100644
index 0000000000..7f8d314858
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
@@ -0,0 +1,130 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import java.util.Map;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
+import static com.github.technus.tectech.util.DoubleCount.sub;
+
+public interface iElementalMapRW<T extends iElementalStack> extends iElementalMapR<T> {
+    iElementalMapRW<T> clone();
+
+    default void cleanUp(){
+        getBackingMap().entrySet().removeIf(entry -> entry.getValue().getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY);
+    }
+
+    default void clear() {
+        getBackingMap().clear();
+    }
+
+    //Remove
+    default T remove(iElementalDefinition def) {
+        return getBackingMap().remove(def);
+    }
+
+    default T remove(iElementalStack has) {
+        return remove(has.getDefinition());
+    }
+
+    default void removeAll(iElementalDefinition... definitions) {
+        for (iElementalDefinition def : definitions) {
+            getBackingMap().remove(def);
+        }
+    }
+
+    default void removeAll(iElementalStack... hasElementalDefinition) {
+        for (iElementalStack has : hasElementalDefinition) {
+            getBackingMap().remove(has.getDefinition());
+        }
+    }
+
+    default boolean removeAmount(boolean testOnly, iElementalStack stack) {
+        return removeAmount(testOnly,stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean removeAmount(boolean testOnly, iElementalDefinition def,double amount) {
+        T target = getBackingMap().get(def);
+        if (target == null) {
+            return false;
+        }
+        if (testOnly) {
+            return target.getAmount() >= amount;
+        } else {
+            double newAmount = sub(target.getAmount(),amount);
+            if (newAmount > 0) {
+                getBackingMap().put(target.getDefinition(), (T)target.mutateAmount(newAmount));
+                return true;
+            } else if (newAmount == 0) {
+                getBackingMap().remove(def);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    default boolean removeAllAmounts(boolean testOnly, iElementalStack... stacks) {
+        boolean test = true;
+        for (iElementalStack stack : stacks) {
+            test &= removeAmount(true, stack);
+        }
+        if (testOnly || !test) {
+            return test;
+        }
+        for (iElementalStack stack : stacks) {
+            removeAmount(false, stack);
+        }
+        return true;
+    }
+
+    default boolean removeAllAmounts(boolean testOnly, iElementalMapR<? extends iElementalStack> container) {
+        boolean test=true;
+        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
+            test &= removeAmount(true, entry.getValue());
+        }
+        if (testOnly || !test) {
+            return test;
+        }
+        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
+            removeAmount(false, entry.getValue());
+        }
+        return true;
+    }
+
+    //Put replace
+    default T putReplace(T defStackUnsafe) {
+        return getBackingMap().put(defStackUnsafe.getDefinition(), defStackUnsafe);
+    }
+
+    default void putReplaceAll(T... defStacks) {
+        for (T defStack : defStacks) {
+            getBackingMap().put(defStack.getDefinition(), defStack);
+        }
+    }
+
+    default void putReplaceAll(iElementalMapR<T> inContainerUnsafe) {
+        getBackingMap().putAll(inContainerUnsafe.getBackingMap());
+    }
+
+    //Put unify
+    default T putUnify(T def) {
+        T stack=getBackingMap().get(def.getDefinition());
+        if(stack==null) {
+            return getBackingMap().put(def.getDefinition(), def);
+        }
+        return getBackingMap().put(def.getDefinition(), (T)stack.mutateAmount(def.getAmount()+stack.getAmount()));
+    }
+
+    default void putUnifyAll(T... defs) {
+        for (T def : defs) {
+            putUnify(def);
+        }
+    }
+
+    default void putUnifyAll(iElementalMapR<T> inTreeUnsafe) {
+        for (T in : inTreeUnsafe.values()) {
+            putUnify(in);
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java
deleted file mode 100644
index e191cc0e0a..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipe implements Comparable<rElementalRecipe> {
-    public final short ID;
-    public final cElementalDefinitionStackMap inEM;
-    public final cElementalDefinitionStackMap outEM;
-    public final ItemStack[] outItems;
-    public final FluidStack[] outFluids;
-    public Object[] extension;
-
-    public rElementalRecipe(
-            cElementalDefinitionStackMap inEM,//not null plz
-            short id,
-            cElementalDefinitionStackMap outEM,
-            ItemStack[] outItems,
-            FluidStack[] outFluids) {
-        this.inEM = inEM;
-        this.outEM = outEM;
-        this.outItems = outItems;
-        this.outFluids = outFluids;
-        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
-    }
-
-    public rElementalRecipe extend(Object... data) {
-        extension = data;
-        return this;
-    }
-
-    @Override
-    public int compareTo(rElementalRecipe o) {
-        int compare = inEM.compareTo(o.inEM);
-        if(compare!=0) {
-            return compare;
-        }
-        return Short.compare(ID, o.ID);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof rElementalRecipe) {
-            return compareTo((rElementalRecipe) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return inEM.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java
deleted file mode 100644
index ed5e46f43f..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipeMap {//TODO FIX
-    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
-    private final HashMap<cElementalDefinitionStackMap, HashMap<Short, rElementalRecipe>> recipes;
-
-    public rElementalRecipeMap() {
-        recipes = new HashMap<>();
-    }
-
-    public rElementalRecipe put(rElementalRecipe in) {
-        HashMap<Short, rElementalRecipe> r = recipes.computeIfAbsent(in.inEM, k -> new HashMap<>());
-        return r.put(in.ID, in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
-        //It is either bad, or unimportant if you use different id's
-    }
-
-    public void putAll(rElementalRecipe... contents) {
-        for (rElementalRecipe recipe : contents) {
-            put(recipe);
-        }
-    }
-
-    public rElementalRecipe remove(cElementalStackMap map, short id) {
-        return recipes.get(map).remove(id);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> remove(cElementalStackMap map) {
-        return recipes.remove(map);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> findExact(cElementalInstanceStackMap in) {
-        return recipes.get(in.toDefinitionMapForComparison());//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
-    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findExact(cElementalStackMap in) {
-        return recipes.get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //this does check if the map contains all the requirements for any recipe, and the required amounts
-    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalMutableDefinitionStackMap in, boolean testOnlyTruePreferred) {
-        for (Map.Entry<cElementalDefinitionStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnlyTruePreferred, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalInstanceStackMap in, boolean testOnly) {
-        for (Map.Entry<cElementalDefinitionStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnly, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    //To check for instance data and other things use recipe extensions!
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
new file mode 100644
index 0000000000..8c0fb40a4b
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
@@ -0,0 +1,57 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class rElementalRecipe implements Comparable<rElementalRecipe> {
+    public final short                      ID;
+    public final cElementalConstantStackMap inEM;
+    public final cElementalConstantStackMap outEM;
+    public final ItemStack[]                outItems;
+    public final FluidStack[] outFluids;
+    public Object[] extension;
+
+    public rElementalRecipe(
+            cElementalConstantStackMap inEM,//not null plz
+            short id,
+            cElementalConstantStackMap outEM,
+            ItemStack[] outItems,
+            FluidStack[] outFluids) {
+        this.inEM = inEM;
+        this.outEM = outEM;
+        this.outItems = outItems;
+        this.outFluids = outFluids;
+        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
+    }
+
+    public rElementalRecipe extend(Object... data) {
+        extension = data;
+        return this;
+    }
+
+    @Override
+    public int compareTo(rElementalRecipe o) {
+        int compare = inEM.compareTo(o.inEM);
+        if(compare!=0) {
+            return compare;
+        }
+        return Short.compare(ID, o.ID);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof rElementalRecipe) {
+            return compareTo((rElementalRecipe) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return inEM.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
new file mode 100644
index 0000000000..56a9030354
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
@@ -0,0 +1,73 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.*;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class rElementalRecipeMap {//TODO FIX
+    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
+    private final HashMap<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> recipes;
+
+    public rElementalRecipeMap() {
+        recipes = new HashMap<>();
+    }
+
+    public rElementalRecipe put(rElementalRecipe in) {
+        HashMap<Short, rElementalRecipe> r = recipes.computeIfAbsent(in.inEM, k -> new HashMap<>());
+        return r.put(in.ID, in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
+        //It is either bad, or unimportant if you use different id's
+    }
+
+    public void putAll(rElementalRecipe... contents) {
+        for (rElementalRecipe recipe : contents) {
+            put(recipe);
+        }
+    }
+
+    public rElementalRecipe remove(iElementalMapR<cElementalDefinitionStack> map, short id) {
+        return recipes.get(map).remove(id);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    public HashMap<Short, rElementalRecipe> remove(iElementalMapR<cElementalDefinitionStack> map) {
+        return recipes.remove(map);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    public HashMap<Short, rElementalRecipe> findExact(cElementalInstanceStackMap in) {
+        return recipes.get(in.toDefinitionMapForComparison());//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
+    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
+    @Deprecated
+    public HashMap<Short, rElementalRecipe> findExact(iElementalMapR<cElementalDefinitionStack> in) {
+        return recipes.get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //this does check if the map contains all the requirements for any recipe, and the required amounts
+    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
+    @Deprecated
+    public HashMap<Short, rElementalRecipe> findMatch(cElementalDefinitionStackMap in, boolean testOnlyTruePreferred) {
+        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
+            if (in.removeAllAmounts(testOnlyTruePreferred, cElementalDefinitionStackMapHashMapEntry.getKey())) {
+                return cElementalDefinitionStackMapHashMapEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    public HashMap<Short, rElementalRecipe> findMatch(cElementalInstanceStackMap in, boolean testOnly) {
+        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
+            if (in.removeAllAmounts(testOnly, cElementalDefinitionStackMapHashMapEntry.getKey())) {
+                return cElementalDefinitionStackMapHashMapEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    //To check for instance data and other things use recipe extensions!
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
index a2d22c30ed..1e03c8130f 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
@@ -5,12 +5,11 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElem
 import net.minecraft.nbt.NBTTagCompound;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-import static com.github.technus.tectech.util.DoubleCount.add;
 
 /**
  * Created by danie_000 on 20.11.2016.
  */
-public final class cElementalDefinitionStack implements iHasElementalDefinition {
+public final class cElementalDefinitionStack implements iElementalStack {
     public final iElementalDefinition definition;
     public final double amount;
 
@@ -24,6 +23,14 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
         return this;//IMMUTABLE
     }
 
+    @Override
+    public cElementalDefinitionStack mutateAmount(double amount) {
+        if(this.amount==amount){
+            return this;
+        }
+        return new cElementalDefinitionStack(definition,amount);//IMMUTABLE
+    }
+
     @Override
     public iElementalDefinition getDefinition() {
         return definition;//IMMUTABLE
@@ -57,26 +64,8 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
                 nbt.getLong("q")+nbt.getDouble("Q"));
     }
 
-    public cElementalDefinitionStack addAmountIntoNewInstance(double amount) {
-        if(amount==0) {
-            return this;
-        }
-        return new cElementalDefinitionStack(definition, add(amount,this.amount));
-    }
-
-    public cElementalDefinitionStack addAmountIntoNewInstance(cElementalDefinitionStack... other) {
-        if (other == null || other.length == 0) {
-            return this;
-        }
-        double l = 0;
-        for (cElementalDefinitionStack stack : other) {
-            l= add(l,stack.amount);
-        }
-        return addAmountIntoNewInstance(l);
-    }
-
     @Override
-    public int compareTo(iHasElementalDefinition o) {
+    public int compareTo(iElementalStack o) {
         return definition.compareTo(o.getDefinition());
     }
 
@@ -85,8 +74,8 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
         if (obj instanceof iElementalDefinition) {
             return definition.compareTo((iElementalDefinition) obj) == 0;
         }
-        if (obj instanceof iHasElementalDefinition) {
-            return definition.compareTo(((iHasElementalDefinition) obj).getDefinition()) == 0;
+        if (obj instanceof iElementalStack) {
+            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
         }
         return false;
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
index 559d7ab8d9..1c06e560db 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
@@ -1,10 +1,10 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.util.Util;
@@ -24,7 +24,7 @@ import static java.lang.Math.*;
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class cElementalInstanceStack implements iHasElementalDefinition {
+public final class cElementalInstanceStack implements iElementalStack {
     public static int MIN_MULTIPLE_DECAY_CALLS=4,MAX_MULTIPLE_DECAY_CALLS=16;
     public static double DECAY_CALL_PER=AVOGADRO_CONSTANT;//todo
 
@@ -81,6 +81,12 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return new cElementalInstanceStack(this);
     }
 
+    @Override
+    public cElementalInstanceStack mutateAmount(double amount) {
+        this.amount = amount;
+        return this;
+    }
+
     @Override
     public double getAmount() {
         return amount;
@@ -170,7 +176,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         if (newInstances == null) {
             nextColor();
         } else {
-            for (cElementalInstanceStack newInstance : newInstances.getOutput().values()) {
+            for (cElementalInstanceStack newInstance : newInstances.getOutput().valuesToArray()) {
                 newInstance.nextColor();
             }
         }
@@ -290,20 +296,20 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
             cElementalInstanceStackMap output = decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, amount);
             if(newProductsAge<0){
                 if(output.size()==1) {
-                    if(output.size()==1 && output.get(0).definition.equals(definition)) {
-                        output.get(0).setEnergy(energy);
-                        output.get(0).age=age;
+                    if(output.size()==1 && output.getFirst().definition.equals(definition)) {
+                        output.getFirst().setEnergy(energy);
+                        output.getFirst().age=age;
                     }
                 }else {
-                    for (cElementalInstanceStack stack : output.values()) {
+                    for (cElementalInstanceStack stack : output.valuesToArray()) {
                         if (stack.definition.equals(definition)) {
                             stack.age = age;
                         }
                     }
                 }
             }else{
-                if(output.size()==1 && output.get(0).definition.equals(definition)) {
-                    output.get(0).setEnergy(energy);
+                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
+                    output.getFirst().setEnergy(energy);
                 }
             }
             if(energy <= 0 && output.getMass() > mass){
@@ -390,20 +396,20 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
             }
 
             if(newProductsAge<0) {
-                if (output.size() == 1 && output.get(0).definition.equals(definition)) {
-                    output.get(0).setEnergy(energy);
-                    output.get(0).age = age;
+                if (output.size() == 1 && output.getFirst().definition.equals(definition)) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().age = age;
                 } else {
-                    for (cElementalInstanceStack stack : output.values()) {
+                    for (cElementalInstanceStack stack : output.valuesToArray()) {
                         if (stack.definition.equals(definition)) {
                             stack.age = age;
                         }
                     }
                 }
             }else{
-                if(output.size()==1 && output.get(0).definition.equals(definition)) {
-                    output.get(0).setEnergy(energy);
-                    output.get(0).age=age;
+                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().age=age;
                 }
             }
             if(energy <= 0 && output.getMass() > getMass()){
@@ -491,10 +497,10 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         scanContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
     }
 
-    private void scanContents(ArrayList<String> lines, cElementalDefinitionStackMap definitions, int depth, int[] detailsOnDepthLevels){
+    private void scanContents(ArrayList<String> lines, cElementalConstantStackMap definitions, int depth, int[] detailsOnDepthLevels){
         if(definitions!=null && depth<detailsOnDepthLevels.length){
             int deeper=depth+1;
-            for(cElementalDefinitionStack definitionStack:definitions.values()) {
+            for(cElementalDefinitionStack definitionStack:definitions.valuesToArray()) {
                 lines.add("");//def separator
                 if(Util.areBitsSet(SCAN_GET_DEPTH_LEVEL,detailsOnDepthLevels[depth])) {
                     lines.add("DEPTH = " + depth);
@@ -532,7 +538,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
     }
 
     @Override
-    public int compareTo(iHasElementalDefinition o) {//use for unification
+    public int compareTo(iElementalStack o) {//use for unification
         return definition.compareTo(o.getDefinition());
     }
 
@@ -541,8 +547,8 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         if (obj instanceof iElementalDefinition) {
             return definition.compareTo((iElementalDefinition) obj) == 0;
         }
-        if (obj instanceof iHasElementalDefinition) {
-            return definition.compareTo(((iHasElementalDefinition) obj).getDefinition()) == 0;
+        if (obj instanceof iElementalStack) {
+            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
         }
         return false;
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
new file mode 100644
index 0000000000..65f2ed3b78
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
@@ -0,0 +1,23 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Created by danie_000 on 30.01.2017.
+ */
+public interface iElementalStack extends Comparable<iElementalStack>,Cloneable {
+    iElementalDefinition getDefinition();
+
+    double getAmount();
+
+    double getCharge();
+
+    double getMass();
+
+    iElementalStack clone();
+
+    iElementalStack mutateAmount(double amount);
+
+    NBTTagCompound toNBT();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java
deleted file mode 100644
index 1d8af7bab7..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-/**
- * Created by danie_000 on 30.01.2017.
- */
-public interface iHasElementalDefinition extends Comparable<iHasElementalDefinition>,Cloneable {
-    iElementalDefinition getDefinition();
-
-    double getAmount();
-
-    double getCharge();
-
-    double getMass();
-
-    iHasElementalDefinition clone();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
index 51025148a7..43e42df988 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.lang.reflect.Method;
@@ -62,7 +62,7 @@ public abstract class cElementalDefinition extends iElementalDefinition {
         //only of the internal def stacks!!!
         //that allows neat check if the same thing and
         //top hierarchy amount can be used to store amount info
-        return compareInnerContentsWithAmounts(getSubParticles().values(), o.getSubParticles().values());
+        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
     }
 
     //use only for nested operations!
@@ -112,8 +112,8 @@ public abstract class cElementalDefinition extends iElementalDefinition {
         if (obj instanceof iElementalDefinition) {
             return compareTo((iElementalDefinition) obj) == 0;
         }
-        if (obj instanceof iHasElementalDefinition) {
-            return compareTo(((iHasElementalDefinition) obj).getDefinition()) == 0;
+        if (obj instanceof iElementalStack) {
+            return compareTo(((iElementalStack) obj).getDefinition()) == 0;
         }
         return false;
     }
@@ -121,7 +121,7 @@ public abstract class cElementalDefinition extends iElementalDefinition {
     @Override
     public int hashCode() {//Internal amounts should be also hashed
         int hash = -(getSubParticles().size() << 4);
-        for (cElementalDefinitionStack stack : getSubParticles().values()) {
+        for (cElementalDefinitionStack stack : getSubParticles().valuesToArray()) {
             int amount=(int)stack.amount;
             hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.definition.hashCode();
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
index 6ee8591c58..70af6445c9 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
@@ -169,7 +169,7 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
     }
 
     @Override
-    public final cElementalDefinitionStackMap getSubParticles() {
+    public final cElementalConstantStackMap getSubParticles() {
         return null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
index 90ac2eb339..8065e9c170 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
@@ -64,7 +64,7 @@ public abstract class iElementalDefinition implements Comparable<iElementalDefin
 
     public abstract boolean isTimeSpanHalfLife();
 
-    public abstract cElementalDefinitionStackMap getSubParticles();//contents... null if none
+    public abstract cElementalConstantStackMap getSubParticles();//contents... null if none
 
     public abstract aFluidDequantizationInfo someAmountIntoFluidStack();
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
index 3d8b7a881f..0d91b57ed5 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
@@ -1,28 +1,28 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aFluidDequantizationInfo implements iExchangeInfo<iHasElementalDefinition,FluidStack> {
-    private final iHasElementalDefinition in;
-    private final FluidStack out;
+public class aFluidDequantizationInfo implements iExchangeInfo<iElementalStack,FluidStack> {
+    private final iElementalStack in;
+    private final FluidStack      out;
 
-    public aFluidDequantizationInfo(iHasElementalDefinition emIn, FluidStack fluidStackOut){
+    public aFluidDequantizationInfo(iElementalStack emIn, FluidStack fluidStackOut){
         in=emIn;
         out=fluidStackOut;
     }
 
-    public aFluidDequantizationInfo(iHasElementalDefinition emIn, Fluid fluid, int fluidAmount){
+    public aFluidDequantizationInfo(iElementalStack emIn, Fluid fluid, int fluidAmount){
         in=emIn;
         out=new FluidStack(fluid,fluidAmount);
     }
 
     @Override
-    public iHasElementalDefinition input() {
+    public iElementalStack input() {
         return in.clone();//MEH!
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
index 563b87f8ee..39e4ec4671 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
@@ -1,22 +1,22 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack,iHasElementalDefinition> {
-    private final FluidStack in;
-    private final iHasElementalDefinition out;
+public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack, iElementalStack> {
+    private final FluidStack      in;
+    private final iElementalStack out;
 
-    public aFluidQuantizationInfo(FluidStack fluidStackIn, iHasElementalDefinition emOut){
+    public aFluidQuantizationInfo(FluidStack fluidStackIn, iElementalStack emOut){
         in=fluidStackIn;
         out=emOut;
     }
 
-    public aFluidQuantizationInfo(Fluid fluid, int fluidAmount, iHasElementalDefinition emOut){
+    public aFluidQuantizationInfo(Fluid fluid, int fluidAmount, iElementalStack emOut){
         in=new FluidStack(fluid,fluidAmount);
         out=emOut;
     }
@@ -27,7 +27,7 @@ public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack,iHasElem
     }
 
     @Override
-    public iHasElementalDefinition output() {
+    public iElementalStack output() {
         return out.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
index 8b42c61d6c..fb71275276 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -9,22 +9,22 @@ import net.minecraft.item.ItemStack;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aItemDequantizationInfo implements iExchangeInfo<iHasElementalDefinition,ItemStack> {
-    private final iHasElementalDefinition in;
-    private final ItemStack out;
+public class aItemDequantizationInfo implements iExchangeInfo<iElementalStack,ItemStack> {
+    private final iElementalStack in;
+    private final ItemStack       out;
 
-    public aItemDequantizationInfo(iHasElementalDefinition emIn, ItemStack itemStackOut){
+    public aItemDequantizationInfo(iElementalStack emIn, ItemStack itemStackOut){
         in=emIn;
         out=itemStackOut;
     }
 
-    public aItemDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, Materials material, int amount) {
+    public aItemDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int amount) {
         in = emIn;
         out = GT_OreDictUnificator.get(prefix, material, amount);
     }
 
     @Override
-    public iHasElementalDefinition input() {
+    public iElementalStack input() {
         return in.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
index 8f33f5096d..da9950a186 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -11,18 +11,18 @@ import net.minecraftforge.oredict.OreDictionary;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aItemQuantizationInfo implements iExchangeInfo<ItemStack,iHasElementalDefinition> {
-    private final ItemStack in;
-    private final boolean skipNBT;
-    private final iHasElementalDefinition out;
+public class aItemQuantizationInfo implements iExchangeInfo<ItemStack, iElementalStack> {
+    private final ItemStack       in;
+    private final boolean         skipNBT;
+    private final iElementalStack out;
 
-    public aItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, iHasElementalDefinition emOut) {
+    public aItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, iElementalStack emOut) {
         in = itemStackIn;
         out = emOut;
         this.skipNBT = skipNBT;
     }
 
-    public aItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, iHasElementalDefinition emOut) {
+    public aItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, iElementalStack emOut) {
         in = GT_OreDictUnificator.get(prefix, material, amount);
         out = emOut;
         this.skipNBT = skipNBT;
@@ -34,7 +34,7 @@ public class aItemQuantizationInfo implements iExchangeInfo<ItemStack,iHasElemen
     }
 
     @Override
-    public iHasElementalDefinition output() {
+    public iElementalStack output() {
         return out.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
index bbf94682b4..20f2252bd8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
@@ -1,37 +1,37 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aOredictDequantizationInfo implements iExchangeInfo<iHasElementalDefinition,String> {
-    private final iHasElementalDefinition in;
-    public final String out;
-    public final int amount;
+public class aOredictDequantizationInfo implements iExchangeInfo<iElementalStack,String> {
+    private final iElementalStack in;
+    public final  String          out;
+    public final  int             amount;
 
-    public aOredictDequantizationInfo(iHasElementalDefinition emIn, String name, int qty) {
+    public aOredictDequantizationInfo(iElementalStack emIn, String name, int qty) {
         in = emIn;
         out =name;
         amount = qty;
     }
 
-    public aOredictDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, Materials material, int qty) {
+    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int qty) {
         in = emIn;
         out = prefix.name() + material.mName;
         amount = qty;
     }
 
-    public aOredictDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, String materialName, int qty) {
+    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, String materialName, int qty) {
         in = emIn;
         out = prefix.name() + materialName;
         amount = qty;
     }
 
     @Override
-    public iHasElementalDefinition input() {
+    public iElementalStack input() {
         return in.clone();//MEH!
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
index 964d317b80..252b524185 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
@@ -1,30 +1,30 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aOredictQuantizationInfo implements iExchangeInfo<String,iHasElementalDefinition> {
-    public final String in;
-    public final int amount;
-    private final iHasElementalDefinition out;
+public class aOredictQuantizationInfo implements iExchangeInfo<String, iElementalStack> {
+    public final  String          in;
+    public final  int             amount;
+    private final iElementalStack out;
 
-    public aOredictQuantizationInfo(String name, int qty, iHasElementalDefinition emOut){
+    public aOredictQuantizationInfo(String name, int qty, iElementalStack emOut){
         in=name;
         amount=qty;
         out=emOut;
     }
 
-    public aOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, iHasElementalDefinition emOut){
+    public aOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, iElementalStack emOut){
         in=prefix.name() + material.mName;
         amount=qty;
         out=emOut;
     }
 
-    public aOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, iHasElementalDefinition emOut){
+    public aOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, iElementalStack emOut){
         in=prefix.name() + materialName;
         amount=qty;
         out=emOut;
@@ -36,7 +36,7 @@ public class aOredictQuantizationInfo implements iExchangeInfo<String,iHasElemen
     }
 
     @Override
-    public iHasElementalDefinition output() {
+    public iElementalStack output() {
         return out.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
index 69a4b9683c..39f946c54a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -69,14 +69,14 @@ public class bTransformationInfo {
         this.oredictDequantization = oredictDequantization;
     }
 
-    public void addFluid(iHasElementalDefinition em, FluidStack fluidStack){
+    public void addFluid(iElementalStack em, FluidStack fluidStack){
         fluidQuantization.put(fluidStack.getFluidID(),new aFluidQuantizationInfo(fluidStack,em));
         fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluidStack));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addFluid(iHasElementalDefinition em, Fluid fluid, int fluidAmount){
+    public void addFluid(iElementalStack em, Fluid fluid, int fluidAmount){
         fluidQuantization.put(fluid.getID(),new aFluidQuantizationInfo(fluid,fluidAmount,em));
         fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluid,fluidAmount));
         STACKS_REGISTERED.add(em.getDefinition());
@@ -87,35 +87,35 @@ public class bTransformationInfo {
         itemQuantization.put(aIQI,aIQI);
     }
 
-    public void addItem(iHasElementalDefinition em, ItemStack itemStack, boolean skipNBT){
+    public void addItem(iElementalStack em, ItemStack itemStack, boolean skipNBT){
         addItemQuantization(new aItemQuantizationInfo(itemStack,skipNBT,em));
         itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,itemStack));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addItem(iHasElementalDefinition em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
+    public void addItem(iElementalStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
         addItemQuantization(new aItemQuantizationInfo(prefix,material,amount,skipNBT,em));
         itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,prefix,material,amount));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addOredict(iHasElementalDefinition em, String name, int qty){
+    public void addOredict(iElementalStack em, String name, int qty){
         oredictQuantization.put(OreDictionary.getOreID(name),new aOredictQuantizationInfo(name,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,name,qty));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, Materials material, int qty){
+    public void addOredict(iElementalStack em, OrePrefixes prefix, Materials material, int qty){
         oredictQuantization.put(OreDictionary.getOreID(prefix.name() + material.mName),new aOredictQuantizationInfo(prefix,material,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,material,qty));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, String materialName, int qty){
+    public void addOredict(iElementalStack em, OrePrefixes prefix, String materialName, int qty){
         oredictQuantization.put(OreDictionary.getOreID(prefix.name() + materialName),new aOredictQuantizationInfo(prefix,materialName,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,materialName,qty));
         STACKS_REGISTERED.add(em.getDefinition());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
index e97d5994e9..291ec8fe6b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
@@ -3,9 +3,9 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -83,33 +83,23 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     private final boolean iaeaDefinitionExistsAndHasEnergyLevels;
 
-    private final cElementalDefinitionStackMap elementalStacks;
+    private final cElementalConstantStackMap elementalStacks;
 
     //stable is rawLifeTime>=10^9
 
-    @Deprecated
-    public dAtomDefinition(iElementalDefinition... things) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(things));
-    }
-
-    @Deprecated
-    private dAtomDefinition(boolean check, iElementalDefinition... things) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(things));
-    }
-
     public dAtomDefinition(cElementalDefinitionStack... things) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(things));
+        this(true, new cElementalConstantStackMap(things));
     }
 
     private dAtomDefinition(boolean check, cElementalDefinitionStack... things) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(things));
+        this(check, new cElementalConstantStackMap(things));
     }
 
-    public dAtomDefinition(cElementalDefinitionStackMap things) throws tElementalException {
+    public dAtomDefinition(cElementalConstantStackMap things) throws tElementalException {
         this(true, things);
     }
 
-    private dAtomDefinition(boolean check, cElementalDefinitionStackMap things) throws tElementalException {
+    private dAtomDefinition(boolean check, cElementalConstantStackMap things) throws tElementalException {
         if (check && !canTheyBeTogether(things)) {
             throw new tElementalException("Atom Definition error");
         }
@@ -121,7 +111,7 @@ public final class dAtomDefinition extends cElementalDefinition {
         int neutralCount = 0, element = 0;
         int type = 0;
         boolean containsAnti = false;
-        for (cElementalDefinitionStack stack : elementalStacks.values()) {
+        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
             iElementalDefinition def = stack.definition;
             int amount = (int)stack.amount;
             if((int)stack.amount!=stack.amount){
@@ -274,10 +264,10 @@ public final class dAtomDefinition extends cElementalDefinition {
         return rawLifeTime;
     }
 
-    private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
+    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
         boolean nuclei = false;
         long qty=0;
-        for (cElementalDefinitionStack stack : stacks.values()) {
+        for (cElementalDefinitionStack stack : stacks.valuesToArray()) {
             if (stack.definition instanceof dHadronDefinition) {
                 if (((dHadronDefinition) stack.definition).amount != 3) {
                     return false;
@@ -407,7 +397,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     @Override
-    public cElementalDefinitionStackMap getSubParticles() {
+    public cElementalConstantStackMap getSubParticles() {
         return elementalStacks.clone();
     }
 
@@ -484,33 +474,33 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean getDecayFromIaea(ArrayList<cElementalDecay> decaysList, iaeaNuclide.iaeaDecay decay, long energy){
-        cElementalMutableDefinitionStackMap withThis=elementalStacks.toMutable(),newStuff=new cElementalMutableDefinitionStackMap();
+        cElementalDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new cElementalDefinitionStackMap();
         switch (decay.decayName){
             case "D": {
                 if (withThis.removeAllAmounts(false, deuterium.definition.getSubParticles())){
                     withThis.putReplace(deuterium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "3H": {
                 if (withThis.removeAllAmounts(false, tritium.definition.getSubParticles())){
                     withThis.putReplace(tritium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "3HE": {
                 if (withThis.removeAllAmounts(false, helium_3.definition.getSubParticles())){
                     withThis.putReplace(helium_3);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "8BE": {
                 if (withThis.removeAllAmounts(false, beryllium_8.definition.getSubParticles())){
                     withThis.putReplace(beryllium_8);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
@@ -518,8 +508,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, carbon_14.definition.getSubParticles())){
                     newStuff.putReplace(carbon_14);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -532,8 +522,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, neon_24.definition.getSubParticles())){
                     newStuff.putReplace(neon_24);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -546,8 +536,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, silicon_34.definition.getSubParticles())){
                     newStuff.putReplace(silicon_34);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -560,8 +550,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2,dHadronDefinition.hadron_p2)){
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -576,8 +566,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -592,8 +582,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -608,8 +598,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -624,8 +614,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -639,8 +629,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     withThis.putUnify(dHadronDefinition.hadron_n1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -654,8 +644,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     withThis.putUnify(dHadronDefinition.hadron_n2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -670,8 +660,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -686,8 +676,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -703,8 +693,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -720,8 +710,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -736,8 +726,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -753,8 +743,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_n1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -770,8 +760,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_n2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -786,8 +776,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -801,8 +791,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -817,8 +807,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -833,8 +823,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -849,8 +839,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     newStuff.putReplace(dHadronDefinition.hadron_p3);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -863,8 +853,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
                     newStuff.putReplace(dHadronDefinition.hadron_n1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -877,8 +867,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
                     newStuff.putReplace(dHadronDefinition.hadron_n2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -891,8 +881,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -905,8 +895,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
                     newStuff.putReplace(dHadronDefinition.hadron_p2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -1001,8 +991,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     newStuff.putReplace(eBosonDefinition.boson_Y__1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -1023,10 +1013,10 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean Emmision(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStack emit) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAmount(false, emit)) {
             try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), emit));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), emit));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1038,10 +1028,10 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean alphaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAllAmounts(false, alpha.definition.getSubParticles())) {
             try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), alpha));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), alpha));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1053,11 +1043,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean MbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAmount(false, dHadronDefinition.hadron_n1)) {
             try {
                 tree.putUnify(dHadronDefinition.hadron_p1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e1, eNeutrinoDefinition.lepton_Ve_1));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e1, eNeutrinoDefinition.lepton_Ve_1));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1069,11 +1059,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean PbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAmount(false, dHadronDefinition.hadron_p1)) {
             try {
                 tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e_1, eNeutrinoDefinition.lepton_Ve1));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e_1, eNeutrinoDefinition.lepton_Ve1));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1085,11 +1075,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean ElectronCapture(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)) {
             try {
                 tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), eNeutrinoDefinition.lepton_Ve1));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eNeutrinoDefinition.lepton_Ve1));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1100,11 +1090,11 @@ public final class dAtomDefinition extends cElementalDefinition {
         return false;
     }
 
-    private boolean Fission(ArrayList<cElementalDecay> decaysList, cElementalMutableDefinitionStackMap fissile, cElementalMutableDefinitionStackMap particles,double probability,boolean spontaneousCheck) {
-        cElementalMutableDefinitionStackMap heavy = new cElementalMutableDefinitionStackMap();
-        double[] liquidDrop= liquidDropFunction(Math.abs(element)<=97);
+    private boolean Fission(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStackMap fissile, cElementalDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
+        cElementalDefinitionStackMap heavy      = new cElementalDefinitionStackMap();
+        double[]                     liquidDrop = liquidDropFunction(Math.abs(element)<=97);
 
-        for(cElementalDefinitionStack stack: fissile.values()){
+        for(cElementalDefinitionStack stack: fissile.valuesToArray()){
             if(spontaneousCheck && stack.definition instanceof dHadronDefinition &&
                     (stack.amount<=80 || stack.amount<90 && XSTR_INSTANCE.nextInt(10)<stack.amount-80)) {
                 return false;
@@ -1138,9 +1128,9 @@ public final class dAtomDefinition extends cElementalDefinition {
         }
 
         try {
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_optimized_unsafeLeavesExposedElementalTree()),1));
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_optimized_unsafeLeavesExposedElementalTree()),1));
-            decaysList.add(new cElementalDecay(probability, particles.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            decaysList.add(new cElementalDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
             return true;
         } catch (Exception e) {
             if(DEBUG_MODE) {
@@ -1273,7 +1263,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     public cElementalDecay[] getNaturalDecayInstant() {
         //disembody
         ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<>();
-        for (cElementalDefinitionStack elementalStack : elementalStacks.values()) {
+        for (cElementalDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
             if (elementalStack.definition.getType() == 1 || elementalStack.definition.getType() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(elementalStack);
@@ -1302,12 +1292,12 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     @Override
     public dAtomDefinition getAnti() {
-        cElementalMutableDefinitionStackMap anti = new cElementalMutableDefinitionStackMap();
-        for (cElementalDefinitionStack stack : elementalStacks.values()) {
+        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
+        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
             anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
         }
         try {
-            return new dAtomDefinition(anti.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+            return new dAtomDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
         } catch (tElementalException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
index 4ea5eb3776..aa0951d98c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -58,31 +58,21 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     //private final FluidStack fluidThing;
     //private final ItemStack itemThing;
 
-    private final cElementalDefinitionStackMap quarkStacks;
-
-    @Deprecated
-    public dHadronDefinition(eQuarkDefinition... quarks) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(quarks));
-    }
-
-    @Deprecated
-    private dHadronDefinition(boolean check, eQuarkDefinition... quarks) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(quarks));
-    }
+    private final cElementalConstantStackMap quarkStacks;
 
     public dHadronDefinition(cElementalDefinitionStack... quarks) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(quarks));
+        this(true, new cElementalConstantStackMap(quarks));
     }
 
     private dHadronDefinition(boolean check, cElementalDefinitionStack... quarks) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(quarks));
+        this(check, new cElementalConstantStackMap(quarks));
     }
 
-    public dHadronDefinition(cElementalDefinitionStackMap quarks) throws tElementalException {
+    public dHadronDefinition(cElementalConstantStackMap quarks) throws tElementalException {
         this(true, quarks);
     }
 
-    private dHadronDefinition(boolean check, cElementalDefinitionStackMap quarks) throws tElementalException {
+    private dHadronDefinition(boolean check, cElementalConstantStackMap quarks) throws tElementalException {
         if (check && !canTheyBeTogether(quarks)) {
             throw new tElementalException("Hadron Definition error");
         }
@@ -93,7 +83,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
         int type = 0;
         boolean containsAnti = false;
         double mass = 0;
-        for (cElementalDefinitionStack quarkStack : quarkStacks.values()) {
+        for (cElementalDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
             amount += quarkStack.amount;
             if((int)quarkStack.amount!=quarkStack.amount){
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
@@ -131,9 +121,9 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     }
 
     //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
+    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
         long amount = 0;
-        for (cElementalDefinitionStack quarks : stacks.values()) {
+        for (cElementalDefinitionStack quarks : stacks.valuesToArray()) {
             if (!(quarks.definition instanceof eQuarkDefinition)) {
                 return false;
             }
@@ -153,7 +143,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
         if(sym!=null){
             name.append(' ').append(sym);
         }else {
-            for (cElementalDefinitionStack quark : quarkStacks.values()) {
+            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
                 name.append(' ').append(quark.definition.getSymbol()).append((int)quark.amount);
             }
         }
@@ -184,7 +174,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
             return sym;
         }else {
             StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.values()) {
+            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.amount; i++) {
                     symbol.append(quark.definition.getSymbol());
                 }
@@ -200,7 +190,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
             return sym;
         }else {
             StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.values()) {
+            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.amount; i++) {
                     symbol.append(quark.definition.getShortSymbol());
                 }
@@ -215,13 +205,13 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     }
 
     @Override
-    public cElementalDefinitionStackMap getSubParticles() {
+    public cElementalConstantStackMap getSubParticles() {
         return quarkStacks;
     }
 
     @Override
     public cElementalDecay[] getNaturalDecayInstant() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
+        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
             return cElementalDecay.noProduct;
         }
@@ -243,7 +233,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     @Override
     public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
+        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
             return cElementalDecay.noProduct;
         }
@@ -277,7 +267,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     @Override
     public cElementalDecay[] getDecayArray() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
+        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (amount == 2 && quarkStacks.length == 2 &&
                 quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() &&
                 quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
@@ -297,15 +287,17 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
             cElementalDefinitionStack[] decay;
             if (Math.abs(lastQuark.getType()) > 1) {
-                decay = lastQuark.getDecayArray()[1].outputStacks.values();
+                decay = lastQuark.getDecayArray()[1].outputStacks.valuesToArray();
             } else {
-                decay = lastQuark.getDecayArray()[2].outputStacks.values();
+                decay = lastQuark.getDecayArray()[2].outputStacks.valuesToArray();
             }
             newBaryon.add((eQuarkDefinition) decay[0].definition);
             Particles[0] = decay[1].definition;
             Particles[1] = decay[2].definition;
 
-            eQuarkDefinition[] contentOfBaryon = newBaryon.toArray(new eQuarkDefinition[3]);
+            cElementalDefinitionStack[] contentOfBaryon = newBaryon.stream()
+                    .map(eQuarkDefinition -> new cElementalDefinitionStack(eQuarkDefinition,1))
+                    .toArray(cElementalDefinitionStack[]::new);
 
             try {
                 return new cElementalDecay[]{
@@ -363,12 +355,12 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     @Override
     public iElementalDefinition getAnti() {
-        cElementalMutableDefinitionStackMap anti = new cElementalMutableDefinitionStackMap();
-        for (cElementalDefinitionStack stack : quarkStacks.values()) {
+        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
+        for (cElementalDefinitionStack stack : quarkStacks.valuesToArray()) {
             anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
         }
         try {
-            return new dHadronDefinition(anti.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+            return new dHadronDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
         } catch (tElementalException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -414,10 +406,10 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     public static void run() {
         try {
-            hadron_p = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
+            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
             protonMass = hadron_p.mass;
             //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
-            hadron_p = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
+            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
             SYMBOL_MAP.put(hadron_p,"p");
             NAME_MAP.put(hadron_p,"Proton");
             DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
@@ -425,10 +417,10 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
             SYMBOL_MAP.put(hadron_p_,"~p");
             NAME_MAP.put(hadron_p_,"Anti Proton");
             DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
-            hadron_n = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
+            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.mass;
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
-            hadron_n = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
+            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
             NAME_MAP.put(hadron_n, "Neutron");
             DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
index a3efe12b7e..8096743b78 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
 
 /**
  * Created by danie_000 on 22.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
index 9a82cdd6c0..e87df806d3 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
@@ -1,10 +1,10 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition.*;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
index 1e3b7189a8..c8e3b07f02 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
index c55e7f6364..0f0725d208 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
index 9e5b2e66bb..798066466b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index b0b349a268..05f251924e 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.recipe;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -17,16 +17,16 @@ import java.util.HashSet;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 
 public class TT_recipe extends GT_Recipe {
-    public static final String E_RECIPE_ID = "eRecipeID";
-    public final cElementalDefinitionStackMap[] input;
-    public final cElementalDefinitionStackMap[] output;
-    public final cElementalDefinitionStackMap[] eCatalyst;
-    public final IAdditionalCheck additionalCheck;
+    public static final String                E_RECIPE_ID = "eRecipeID";
+    public final cElementalConstantStackMap[] input;
+    public final cElementalConstantStackMap[] output;
+    public final cElementalConstantStackMap[] eCatalyst;
+    public final IAdditionalCheck             additionalCheck;
 
     public TT_recipe(boolean aOptimize,
                      ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
                      FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue,
-                     cElementalDefinitionStackMap[] in, cElementalDefinitionStackMap[] out, cElementalDefinitionStackMap[] catalyst, IAdditionalCheck check){
+                     cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check){
         super(aOptimize,aInputs,aOutputs,aSpecialItems,aChances,aFluidInputs,aFluidOutputs,aDuration,aEUt,aSpecialValue);
         input=in;
         output=out;
@@ -110,7 +110,7 @@ public class TT_recipe extends GT_Recipe {
         }
         if (input != null) {
             if (in != null) {
-                for (cElementalDefinitionStackMap anInput : input) {
+                for (cElementalConstantStackMap anInput : input) {
                     if (anInput != null && anInput.hasStacks()) {
                         if (in.hasStacks()) {
                             if (!in.removeAllAmounts(consume, anInput)) {
@@ -181,7 +181,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in, cElementalDefinitionStackMap[] out, cElementalDefinitionStackMap[] catalyst, IAdditionalCheck check) {
+                                cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchItem=researchItem;
         }
@@ -189,7 +189,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in) {
+                                cElementalConstantStackMap[] in) {
             this(aOptimize, researchItem, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
@@ -199,9 +199,9 @@ public class TT_recipe extends GT_Recipe {
         public final GT_Recipe scannerRecipe;
 
         public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
-                                ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
-                                FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in, cElementalDefinitionStackMap[] out, cElementalDefinitionStackMap[] catalyst, IAdditionalCheck check) {
+                           ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
+                           FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
+                           cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchEM=researchEM;
             this.scannerRecipe=scannerRecipe;
@@ -210,7 +210,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in) {
+                                cElementalConstantStackMap[] in) {
             this(aOptimize, scannerRecipe, researchEM, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index b08265d2c5..93d6f4ea2b 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.recipe;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
@@ -131,7 +131,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMmachineRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalDefinitionStackMap[] eInputs,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -165,7 +165,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMcrafterRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalDefinitionStackMap[] eInputs, cElementalDefinitionStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchItem==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -188,7 +188,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addScannableEMmachineRecipe(
             iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalDefinitionStackMap[] eInputs,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -215,7 +215,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalDefinitionStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_machine.machine)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,aInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 aFluidInputs,machineDuration,machineEUt,machineAmperage,eInputs));
@@ -224,7 +224,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addScannableEMcrafterRecipe(
             iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalDefinitionStackMap[] eInputs, cElementalDefinitionStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchEM==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -240,7 +240,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalDefinitionStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_crafting.crafter)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,null,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 null,crafterDuration,crafterEUt,crafterAmperage,eInputs,null,catalyst,check));
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index bfd7d266c0..b1f6d8887b 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalInstanceContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
@@ -58,8 +58,8 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
             aStack.stackSize = 1;
             if (tTileEntity instanceof IGregTechTileEntity) {
                 IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-                if (metaTE instanceof iElementalInstanceContainer) {
-                    cElementalInstanceStackMap content = ((iElementalInstanceContainer) metaTE).getContainerHandler();
+                if (metaTE instanceof iElementalContainer) {
+                    cElementalInstanceStackMap content = ((iElementalContainer) metaTE).getContentHandler();
                     if (tNBT.hasKey("content")) {
                         try {
                             content.putUnifyAll(cElementalInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
@@ -69,12 +69,12 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
                             }
                             return true;
                         }
-                        ((iElementalInstanceContainer) metaTE).purgeOverflow();
+                        ((iElementalContainer) metaTE).purgeOverflow();
                         tNBT.removeTag("content");
                         tNBT.removeTag("symbols");
                         tNBT.removeTag("info");
                     } else if (content.hasStacks()) {
-                        ((iElementalInstanceContainer) metaTE).purgeOverflow();
+                        ((iElementalContainer) metaTE).purgeOverflow();
                         tNBT.setTag("info", content.getInfoNBT());
                         tNBT.setTag("content", content.toNBT());
                         tNBT.setTag("symbols", content.getShortSymbolsNBT());
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index fa1c25cbf5..2513bdf8bf 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -38,17 +38,17 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
     }
 
     //return previous thing
-    public static cElementalDefinitionStackMap setContent(ItemStack containerItem, cElementalDefinitionStackMap definitions){
+    public static cElementalConstantStackMap setContent(ItemStack containerItem, cElementalConstantStackMap definitions){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM) {
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 tNBT = containerItem.stackTagCompound = new NBTTagCompound();
             }
 
-            cElementalDefinitionStackMap oldMap=null;
+            cElementalConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap=cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
                 } catch (tElementalException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
@@ -63,7 +63,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalDefinitionStackMap getContent(ItemStack containerItem){
+    public static cElementalConstantStackMap getContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
 
@@ -71,7 +71,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 return null;
             }
             try {
-                return cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                return cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
             } catch (tElementalException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
@@ -81,17 +81,17 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalDefinitionStackMap clearContent(ItemStack containerItem){
+    public static cElementalConstantStackMap clearContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 return null;
             }
 
-            cElementalDefinitionStackMap oldMap=null;
+            cElementalConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap=cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
                 } catch (tElementalException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index c951229c92..e43feb2351 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index c8606f68f0..d25a0c62ed 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalInstanceContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToElementalPipe;
 import com.github.technus.tectech.util.Util;
@@ -34,7 +34,7 @@ import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 /**
  * Created by danie_000 on 11.12.2016.
  */
-public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements iElementalInstanceContainer, IConnectsToElementalPipe {
+public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements iElementalContainer, IConnectsToElementalPipe {
     private static Textures.BlockIcons.CustomIcon EM_T_SIDES;
     private static Textures.BlockIcons.CustomIcon EM_T_ACTIVE;
     private static Textures.BlockIcons.CustomIcon EM_T_CONN;
@@ -165,7 +165,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     @Override
-    public cElementalInstanceStackMap getContainerHandler() {
+    public cElementalInstanceStackMap getContentHandler() {
         return content;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
index a1e4f5a8a5..1426e8a702 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
@@ -62,7 +62,7 @@ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_H
                 if (aMetaTileEntity != null) {
                     if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputElemental &&
                             opposite == tGTTileEntity.getFrontFacing()) {
-                        ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).getContainerHandler().putUnifyAll(content);
+                        ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).getContentHandler().putUnifyAll(content);
                         ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).updateSlots();
                         content.clear();
                         return;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index 329b3cbc14..a61bf27fe3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -4,9 +4,9 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
@@ -85,10 +85,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnifyAll(in2.definition.getSubParticles());
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -114,10 +114,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnifyAll(in2.definition.getSubParticles());
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -139,10 +139,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnify(in2.definition.getStackForm(1));
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -183,10 +183,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
         PRIMITIVE_FUSE_HANDLERS.put(eQuarkDefinition.class.getName() + '\0' + eQuarkDefinition.class.getName(), (in1, in2, out) -> {
             try {
-                cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                 defs.putUnify(in1.definition.getStackForm(1));
                 defs.putUnify(in2.definition.getStackForm(1));
-                dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                 out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
             } catch (Exception e) {
                 out.putUnifyAll(in1, in2);
@@ -210,10 +210,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     private static boolean fuseAspects(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
         try {
-            cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+            cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
             defs.putUnify(in1.definition.getStackForm(1));
             defs.putUnify(in2.definition.getStackForm(1));
-            dComplexAspectDefinition aspect = new dComplexAspectDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+            dComplexAspectDefinition aspect = new dComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
             out.putUnify(new cElementalInstanceStack(aspect, Math.min(in1.amount, in2.amount)));
         } catch (Exception e) {
             out.putUnifyAll(in1, in2);
@@ -246,10 +246,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnify(in2.definition.getStackForm(1));
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -394,7 +394,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 colliderHandler = FUSE_HANDLERS.get((stack.definition.getClassType() << 16) | stack2.definition.getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             }
-            for (cElementalInstanceStack newStack : map.values()) {
+            for (cElementalInstanceStack newStack : map.valuesToArray()) {
                 check &= newStack.definition.fusionMakesEnergy(newStack.getEnergy());
             }
             //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
@@ -525,7 +525,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         if (started) {
             if (stack == null) {
                 for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
-                    cElementalInstanceStackMap container = inputElemental.getContainerHandler();
+                    cElementalInstanceStackMap container = inputElemental.getContentHandler();
                     if (container.isEmpty()) {
                         continue;
                     }
@@ -590,7 +590,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             if (outputEM != null) {
                 for (int i = 0, lim = Math.min(outputEM.length, eOutputHatches.size()); i < lim; i++) {
                     if (outputEM[i] != null) {
-                        eOutputHatches.get(i).getContainerHandler().putUnifyAll(outputEM[i]);
+                        eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
                         outputEM[i] = null;
                     }
                 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index ad7a2c91a6..ed245b0e97 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
@@ -118,7 +118,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
         cElementalInstanceStackMap map = getInputsClone_EM();
         if (map != null && map.hasStacks()) {
             for (GT_MetaTileEntity_Hatch_InputElemental i : eInputHatches) {
-                i.getContainerHandler().clear();
+                i.getContentHandler().clear();
             }
             return startRecipe(map);
         }
@@ -132,7 +132,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
         outputEM[0] = input;
         outputEM[1] = new cElementalInstanceStackMap();
 
-        for (cElementalInstanceStack stack : outputEM[0].values()) {
+        for (cElementalInstanceStack stack : outputEM[0].valuesToArray()) {
             if (stack.getEnergy() == 0 && stack.definition.decayMakesEnergy(1) &&
                     getBaseMetaTileEntity().decreaseStoredEnergyUnits(
                             (long) (stack.getEnergySettingCost(1) * URANIUM_MASS_TO_EU_INSTANT), false)) {
@@ -156,7 +156,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     @Override
     public void outputAfterRecipe_EM() {
         for (int i = 0; i < 2 && i < eOutputHatches.size(); i++) {
-            eOutputHatches.get(i).getContainerHandler().putUnifyAll(outputEM[i]);
+            eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
             outputEM[i] = null;
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 9814092710..208219cd59 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
@@ -72,7 +72,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         super(aName);
     }
 
-    private void startRecipe(iHasElementalDefinition from, long energy) {
+    private void startRecipe(iElementalStack from, long energy) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = from.getMass();
@@ -98,8 +98,8 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-            cElementalInstanceStackMap map = in.getContainerHandler();
-            for (cElementalInstanceStack stack : map.values()) {
+            cElementalInstanceStackMap map = in.getContentHandler();
+            for (cElementalInstanceStack stack : map.valuesToArray()) {
                 {
                     aFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
                     if (info != null) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index 29ba91d4b7..d4e85de6f9 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -116,7 +116,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-            if (in.getContainerHandler().hasStacks()) {
+            if (in.getContentHandler().hasStacks()) {
                 mEUt = -(int) V[8];
                 eAmpereFlow = 1 + (eInputHatches.size() + eOutputHatches.size() >> 1);
                 mMaxProgresstime = 20;
@@ -149,8 +149,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                     continue;
                 }
                 GT_MetaTileEntity_Hatch_OutputElemental out = eOutputHatches.get(outIndex);
-                out.getContainerHandler().putUnifyAll(in.getContainerHandler());
-                in.getContainerHandler().clear();
+                out.getContentHandler().putUnifyAll(in.getContentHandler());
+                in.getContentHandler().clear();
             }
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index c3e35ba90c..f5504eadc7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -3,9 +3,9 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictQuantizationInfo;
@@ -113,7 +113,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (aOQI == null) {
                                 continue;
                             }
-                            iHasElementalDefinition into = aOQI.output();
+                            iElementalStack into = aOQI.output();
                             if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.amount, is.getItemDamage())}, null, inI)) {
                                 startRecipe(into);
                                 return true;
@@ -124,7 +124,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                         if (DEBUG_MODE) {
                             TecTech.LOGGER.info("Quantifier-Item-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage());
                         }
-                        iHasElementalDefinition into = aIQI.output();
+                        iElementalStack into = aIQI.output();
                         if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aIQI.input().stackSize, is.getItemDamage())}, null, inI)) {
                             startRecipe(into);
                             return true;
@@ -140,7 +140,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                     if (aFQI == null) {
                         continue;
                     }
-                    iHasElementalDefinition into = aFQI.output();
+                    iElementalStack into = aFQI.output();
                     if (into != null && fs.amount >= aFQI.input().amount && isInputEqual(true, false,
                             new FluidStack[]{aFQI.input()}, nullItem, inF, (ItemStack[]) null)) {
                         startRecipe(into);
@@ -152,7 +152,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         return false;
     }
 
-    private void startRecipe(iHasElementalDefinition into) {
+    private void startRecipe(iElementalStack into) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = into.getMass();
@@ -176,7 +176,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             stopMachine();
             return;
         }
-        eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]);
+        eOutputHatches.get(0).getContentHandler().putUnifyAll(outputEM[0]);
         outputEM = null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index b418ec0fa4..d02088e805 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
@@ -218,11 +218,11 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         eRecipe = null;
-        if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContainerHandler().hasStacks() && !eOutputHatches.isEmpty()) {
-            cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContainerHandler();
+        if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContentHandler().hasStacks() && !eOutputHatches.isEmpty()) {
+            cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContentHandler();
             if (ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) {
                 GT_Recipe scannerRecipe = null;
-                for (cElementalInstanceStack stackEM : researchEM.values()) {
+                for (cElementalInstanceStack stackEM : researchEM.valuesToArray()) {
                     objectsScanned = null;
                     eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.definition);
                     if (eRecipe != null) {
@@ -258,7 +258,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             } else if (CustomItemList.scanContainer.isStackEqual(itemStack, false, true)) {
                 eRecipe = null;
                 if (researchEM.hasStacks()) {
-                    objectsScanned = researchEM.takeAllToNewMap();
+                    objectsScanned = researchEM.takeAll();
                     cleanMassEM_EM(objectsScanned.getMass());
 
                     computationRequired = 0;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 1fcc0b42f2..ba6ae223f6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -10,7 +10,7 @@ import com.github.technus.tectech.mechanics.alignment.IAlignmentLimits;
 import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
 import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
 import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
@@ -1297,26 +1297,26 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             }
             double remaining = voider.overflowMax - voider.getOverflowMatter();
             for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-                for (cElementalInstanceStack instance : in.getContainerHandler().values()) {
+                for (cElementalInstanceStack instance : in.getContentHandler().valuesToArray()) {
                     double qty = div(remaining,instance.definition.getMass());
                     if (qty > 0) {
                         qty = min(qty, instance.amount);
                         if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        in.getContainerHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        in.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
                     }
                 }
             }
             for (GT_MetaTileEntity_Hatch_OutputElemental out : eOutputHatches) {
-                for (cElementalInstanceStack instance : out.getContainerHandler().values()) {
+                for (cElementalInstanceStack instance : out.getContentHandler().valuesToArray()) {
                     double qty = div(remaining,instance.definition.getMass());
                     if (qty > 0) {
                         qty = min(qty, instance.amount);
                         if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        out.getContainerHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        out.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
                     }
                 }
             }
@@ -1932,7 +1932,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     public final cElementalInstanceStackMap getInputsClone_EM() {
         cElementalInstanceStackMap in = new cElementalInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eInputHatches) {
-            in.putUnifyAll(hatch.getContainerHandler());
+            in.putUnifyAll(hatch.getContentHandler());
         }
         return in.hasStacks() ? in : null;
     }
@@ -1941,7 +1941,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     public final cElementalInstanceStackMap getOutputsClone_EM() {
         cElementalInstanceStackMap out = new cElementalInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eOutputHatches) {
-            out.putUnifyAll(hatch.getContainerHandler());
+            out.putUnifyAll(hatch.getContentHandler());
         }
         return out.hasStacks() ? out : null;
     }
@@ -1971,7 +1971,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         if (target == null) {
             return;
         }
-        cleanMassEM_EM(target.getContainerHandler().getMass());
+        cleanMassEM_EM(target.getContentHandler().getMass());
     }
 
     public void cleanStackEM_EM(cElementalInstanceStack target) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
index 1ed1278bce..093a418056 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
@@ -116,7 +116,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         cElementalInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.values();
+        cElementalInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
         for (cElementalInstanceStack stack : stacks) {
@@ -129,7 +129,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
             randomStack.amount= sub(randomStack.amount,amountToRemove);//mutates the parent InstanceStackMap
             if (randomStack.amount <= 0) {
                 input.remove(randomStack.definition);
-                stacks = input.values();
+                stacks = input.valuesToArray();
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
             excessMass += mass;
@@ -162,7 +162,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
 
 
         //take all from hatch handler and put into new map - this takes from hatch to inner data storage
-        stacks = input.takeAllToNewMap().values();//cleanup stacks
+        stacks = input.takeAll().valuesToArray();//cleanup stacks
         if (stacks.length > 1) {
             Arrays.sort(stacks, (o1, o2) -> {
                 double m1 = o1.definition.getMass();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
index df21feb9f2..d335bac7ab 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
index 40e2942bab..6ac6ac74c4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
@@ -147,7 +147,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
         cElementalInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.values();
+        cElementalInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
         for (cElementalInstanceStack stack : stacks) {
@@ -185,7 +185,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
         double levelsCountPlus1=precisionFullIn-precisionMinimalIn+1;
 
         //take all from hatch handler and put into new map - this takes from hatch to inner data storage
-        stacks = input.takeAllToNewMap().values();//cleanup stacks
+        stacks = input.takeAll().valuesToArray();//cleanup stacks
         for(cElementalInstanceStack stack:stacks){
             double charge=stack.definition.getCharge()-offsetIn;
             if(charge<precisionMinimalIn && charge>-precisionMinimalIn){
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
index cd6f637d61..97ece16fb1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
index c86c06b2a0..f7aa945d69 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
index 95bb8dce40..2dc9067e22 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index 6b26132292..d9217171d3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -258,7 +258,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
         for (int i = 0; i < 6; i++) {
             int pointer = (int) inputMux[i].get();
             if (pointer >= 0 && pointer < eInputHatches.size()) {
-                handles[i] = eInputHatches.get(pointer).getContainerHandler();
+                handles[i] = eInputHatches.get(pointer).getContentHandler();
             }
         }
 
@@ -315,7 +315,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
         for (int i = 0; i < 6; i++) {
             int pointer = (int) outputMux[i].get();
             if (pointer >= 0 && pointer < eOutputHatches.size()) {
-                handles[i] = eOutputHatches.get(pointer).getContainerHandler();
+                handles[i] = eOutputHatches.get(pointer).getContentHandler();
             }
         }
         //output
-- 
cgit 


From 27946d59f2f7c272f2f91ec393a35f5d26f5293e Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Mon, 17 Jan 2022 22:21:58 +0100
Subject: Cleanup EM api, encapsulate

---
 .../java/com/github/technus/tectech/TecTech.java   |    8 +-
 .../tectech/compatibility/gtpp/GtppAtomLoader.java |   60 +-
 .../entity/projectiles/projectileEM.java           |   16 +-
 .../tileentity/turret/TileTurretHeadEM.java        |   16 +-
 .../tileentity/turretbase/TileTurretBaseEM.java    |    6 +-
 .../definitions/EMComplexAspectDefinition.java     |  308 ++++
 .../definitions/EMPrimalAspectDefinition.java      |   42 +
 .../definitions/dComplexAspectDefinition.java      |  308 ----
 .../definitions/ePrimalAspectDefinition.java       |   42 -
 .../transformations/AspectDefinitionCompat.java    |   20 +-
 .../AspectDefinitionCompatEnabled.java             |   68 +-
 .../thing/metaTileEntity/multi/EssentiaCompat.java |    6 +-
 .../multi/EssentiaCompatEnabled.java               |   10 +-
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |   22 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |   18 +-
 .../technus/tectech/loader/ElementalLoader.java    |   34 +-
 .../tectech/loader/recipe/RecipeLoader.java        |    8 +-
 .../tectech/loader/thing/MachineLoader.java        |    2 +-
 .../tectech/mechanics/anomaly/AnomalyHandler.java  |    8 +-
 .../elementalMatter/core/EMException.java          |   10 +
 .../elementalMatter/core/IEMContainer.java         |   12 +
 .../elementalMatter/core/commands/EMGive.java      |  160 ++
 .../elementalMatter/core/commands/EMList.java      |   95 ++
 .../elementalMatter/core/commands/GiveEM.java      |  160 --
 .../elementalMatter/core/commands/ListEM.java      |   95 --
 .../elementalMatter/core/decay/EMDecay.java        |   90 ++
 .../elementalMatter/core/decay/EMDecayResult.java  |   45 +
 .../core/decay/cElementalDecay.java                |   77 -
 .../core/decay/cElementalDecayResult.java          |   43 -
 .../elementalMatter/core/iElementalContainer.java  |   12 -
 .../core/maps/EMConstantStackMap.java              |   58 +
 .../core/maps/EMDefinitionStackMap.java            |   56 +
 .../core/maps/EMInstanceStackMap.java              |  242 +++
 .../elementalMatter/core/maps/EMStackMap.java      |   50 +
 .../elementalMatter/core/maps/IEMMapRead.java      |  275 ++++
 .../elementalMatter/core/maps/IEMMapWrite.java     |  112 ++
 .../core/maps/IEMMapWriteExact.java                |  166 ++
 .../core/maps/cElementalConstantStackMap.java      |   58 -
 .../core/maps/cElementalDefinitionStackMap.java    |   56 -
 .../core/maps/cElementalInstanceStackMap.java      |  214 ---
 .../core/maps/cElementalStackMap.java              |   50 -
 .../elementalMatter/core/maps/iElementalMapR.java  |  187 ---
 .../elementalMatter/core/maps/iElementalMapRW.java |  130 --
 .../elementalMatter/core/recipes/EMRecipe.java     |   87 +
 .../elementalMatter/core/recipes/EMRecipeMap.java  |   65 +
 .../core/recipes/rElementalRecipe.java             |   57 -
 .../core/recipes/rElementalRecipeMap.java          |   73 -
 .../core/stacks/EMDefinitionStack.java             |   73 +
 .../core/stacks/EMInstanceStack.java               |  605 +++++++
 .../elementalMatter/core/stacks/IEMStack.java      |   37 +
 .../core/stacks/cElementalDefinitionStack.java     |   88 -
 .../core/stacks/cElementalInstanceStack.java       |  566 -------
 .../core/stacks/iElementalStack.java               |   23 -
 .../elementalMatter/core/tElementalException.java  |   10 -
 .../elementalMatter/core/templates/EMComplex.java  |  135 ++
 .../core/templates/EMPrimitive.java                |  283 ++++
 .../core/templates/IEMDefinition.java              |   84 +
 .../core/templates/cElementalDefinition.java       |  135 --
 .../core/templates/cElementalPrimitive.java        |  275 ----
 .../core/templates/iElementalDefinition.java       |   85 -
 .../transformations/EMFluidDequantizationInfo.java |   43 +
 .../transformations/EMFluidQuantizationInfo.java   |   43 +
 .../transformations/EMItemDequantizationInfo.java  |   45 +
 .../transformations/EMItemQuantizationInfo.java    |   69 +
 .../EMOredictDequantizationInfo.java               |   60 +
 .../transformations/EMOredictQuantizationInfo.java |   60 +
 .../core/transformations/EMTransformationInfo.java |  172 ++
 .../core/transformations/IEMExchangeInfo.java      |   11 +
 .../transformations/aFluidDequantizationInfo.java  |   43 -
 .../transformations/aFluidQuantizationInfo.java    |   43 -
 .../transformations/aItemDequantizationInfo.java   |   45 -
 .../transformations/aItemQuantizationInfo.java     |   69 -
 .../aOredictDequantizationInfo.java                |   52 -
 .../transformations/aOredictQuantizationInfo.java  |   52 -
 .../core/transformations/bTransformationInfo.java  |  124 --
 .../core/transformations/iExchangeInfo.java        |   11 -
 .../definitions/complex/EMAtomDefinition.java      | 1694 ++++++++++++++++++++
 .../definitions/complex/EMHadronDefinition.java    |  520 ++++++
 .../definitions/complex/EMNuclideIAEA.java         |  336 ++++
 .../definitions/complex/dAtomDefinition.java       | 1678 -------------------
 .../definitions/complex/dHadronDefinition.java     |  512 ------
 .../definitions/complex/iaeaNuclide.java           |  307 ----
 .../definitions/primitive/EMBosonDefinition.java   |   45 +
 .../definitions/primitive/EMLeptonDefinition.java  |   69 +
 .../primitive/EMNeutrinoDefinition.java            |   59 +
 .../primitive/EMPrimitiveDefinition.java           |   39 +
 .../definitions/primitive/EMQuarkDefinition.java   |  106 ++
 .../primitive/cPrimitiveDefinition.java            |   39 -
 .../definitions/primitive/eBosonDefinition.java    |   45 -
 .../definitions/primitive/eLeptonDefinition.java   |   69 -
 .../definitions/primitive/eNeutrinoDefinition.java |   59 -
 .../definitions/primitive/eQuarkDefinition.java    |  106 --
 .../github/technus/tectech/recipe/TT_recipe.java   |  104 +-
 .../technus/tectech/recipe/TT_recipeAdder.java     |   22 +-
 .../item/DebugElementalInstanceContainer_EM.java   |   40 +-
 .../item/ElementalDefinitionContainer_EM.java      |   26 +-
 .../item/ElementalDefinitionScanStorage_EM.java    |    4 +-
 ...GT_MetaTileEntity_Hatch_ElementalContainer.java |   22 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       |  251 +--
 .../multi/GT_MetaTileEntity_EM_decay.java          |   22 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |   38 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   48 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        |   48 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |   52 +-
 .../multi/em_machine/Behaviour_Centrifuge.java     |   69 +-
 .../multi/em_machine/Behaviour_Electrolyzer.java   |    4 +-
 .../Behaviour_ElectromagneticSeparator.java        |   47 +-
 .../multi/em_machine/Behaviour_PrecisionLaser.java |    4 +-
 .../multi/em_machine/Behaviour_Recycler.java       |    6 +-
 .../multi/em_machine/Behaviour_Scanner.java        |    4 +-
 .../em_machine/GT_MetaTileEntity_EM_machine.java   |   10 +-
 .../tectech/thing/metaTileEntity/multi/other todo  |    4 +-
 .../github/technus/tectech/util/DoubleCount.java   |  122 +-
 113 files changed, 7090 insertions(+), 6618 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 809a7e877d..ef5e146bfa 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -9,8 +9,8 @@ import com.github.technus.tectech.mechanics.commands.ConvertFloat;
 import com.github.technus.tectech.mechanics.commands.ConvertInteger;
 import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerPersistence;
-import com.github.technus.tectech.mechanics.elementalMatter.core.commands.GiveEM;
-import com.github.technus.tectech.mechanics.elementalMatter.core.commands.ListEM;
+import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMGive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMList;
 import com.github.technus.tectech.proxy.CommonProxy;
 import com.github.technus.tectech.util.XSTR;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -203,9 +203,9 @@ public class TecTech {
     public void serverLoad(FMLServerStartingEvent pEvent) {
         pEvent.registerServerCommand(new ConvertInteger());
         pEvent.registerServerCommand(new ConvertFloat());
-        pEvent.registerServerCommand(new ListEM());
+        pEvent.registerServerCommand(new EMList());
         if(DEBUG_MODE) {
-            pEvent.registerServerCommand(new GiveEM());
+            pEvent.registerServerCommand(new EMGive());
             pEvent.registerServerCommand(new CancerCommand());
             pEvent.registerServerCommand(new ChargeCommand());
         }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index f3120fda25..ee7d293e08 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -1,14 +1,14 @@
 package com.github.technus.tectech.compatibility.gtpp;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.lang.reflect.Method;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.*;
 
 public class GtppAtomLoader implements Runnable{
     //region reflect a bit
@@ -59,34 +59,34 @@ public class GtppAtomLoader implements Runnable{
         }
         //endregion
 
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
         generate("GERMANIUM",true,true);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
 
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
 
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index a0b6106151..d594a826bc 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -44,25 +44,25 @@ public class projectileEM extends LaserProjectile {
         }
     }
 
-    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStack projectileContent) {
+    public projectileEM(World par1World, TurretBase turretBase, EMInstanceStack projectileContent) {
         super(par1World, turretBase);
         this.turretBase = turretBase;
         if(projectileContent != null){
             mass=projectileContent.getMass();
             charge=projectileContent.getCharge();
-            massFactor =(float) (projectileContent.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
+            massFactor =(float) (projectileContent.getDefinition().getMass()/ EMHadronDefinition.hadron_n_.getMass());
 
-            if(projectileContent.definition.getType()>1 || projectileContent.definition.getType()<-1) {
+            if(projectileContent.getDefinition().getType()>1 || projectileContent.getDefinition().getType()<-1) {
                 strange = true;
             }
-            if(projectileContent.definition.getType()<0) {
+            if(projectileContent.getDefinition().getType()<0) {
                 antiMatter = true;
             }
 
-            if (projectileContent.definition.getCharge() == 0) {
+            if (projectileContent.getDefinition().getCharge() == 0) {
                 gravity = massFactor / 100f;
             } else {
-                gravity = Math.min(0.0025F / Math.abs(projectileContent.definition.getCharge()), massFactor / 100f);
+                gravity = Math.min(0.0025F / Math.abs(projectileContent.getDefinition().getCharge()), massFactor / 100f);
             }
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index e027c83107..6dc5c4f60a 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.t
 
 import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -14,13 +14,13 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 
 /**
  * Created by Bass on 27/07/2017.
  */
 public class TileTurretHeadEM extends TurretHead{
-    private cElementalInstanceStackMap hatchContentPointer;
+    private EMInstanceStackMap hatchContentPointer;
 
     @Override
     public int getTurretRange() {
@@ -70,11 +70,11 @@ public class TileTurretHeadEM extends TurretHead{
         if (hatchContentPointer == null || hatchContentPointer.isEmpty()) {
             return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
         }
-        cElementalInstanceStack stack = hatchContentPointer.getRandom();
-        double amount = Math.min(AVOGADRO_CONSTANT,stack.amount);
-        hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+        EMInstanceStack stack  = hatchContentPointer.getRandom();
+        double          amount = Math.min(AVOGADRO_CONSTANT, stack.getAmount());
+        hatchContentPointer.removeAmount(stack.getDefinition(),AVOGADRO_CONSTANT);
         stack=stack.clone();
-        stack.amount = amount;
+        stack.setAmount(amount);
         return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index a5d64fb886..0dbc33e007 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import cpw.mods.fml.common.Optional;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -25,7 +25,7 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
         return "turretBaseEM";
     }
 
-    public final cElementalInstanceStackMap getContainerHandler() {
+    public final EMInstanceStackMap getContainerHandler() {
         World worldIn = getWorldObj();
         TileEntity te;
         if ((te = worldIn.getTileEntity(xCoord + 1, yCoord, zCoord)) instanceof IGregTechTileEntity &&
@@ -61,7 +61,7 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
         return null;
     }
 
-    private cElementalInstanceStackMap getFromHatch(GT_MetaTileEntity_Hatch_InputElemental hatch) {
+    private EMInstanceStackMap getFromHatch(GT_MetaTileEntity_Hatch_InputElemental hatch) {
         hatch.updateTexture((byte) 8,(byte) 4);
         return hatch.getContentHandler();
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
new file mode 100644
index 0000000000..432d151b80
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -0,0 +1,308 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
+import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by Tec on 06.05.2017.
+ */
+public final class EMComplexAspectDefinition extends EMComplex {
+    private final int    hash;
+    private final double mass;
+
+    private static final byte nbtType = (byte) 'c';
+
+    private final EMConstantStackMap aspectStacks;
+
+    public EMComplexAspectDefinition(EMDefinitionStack... aspects) throws EMException {
+        this(true, new EMConstantStackMap(aspects));
+    }
+
+    private EMComplexAspectDefinition(boolean check, EMDefinitionStack... aspects) throws EMException {
+        this(check, new EMConstantStackMap(aspects));
+    }
+
+    public EMComplexAspectDefinition(EMConstantStackMap aspects) throws EMException {
+        this(true, aspects);
+    }
+
+    private EMComplexAspectDefinition(boolean check, EMConstantStackMap aspects) throws EMException {
+        if (check && !canTheyBeTogether(aspects)) {
+            throw new EMException("Hadron Definition error");
+        }
+        aspectStacks = aspects;
+        float mass = 0;
+        for (EMDefinitionStack stack : aspects.valuesToArray()) {
+            mass += stack.getMass();
+        }
+        this.mass = mass;
+        hash = super.hashCode();
+    }
+
+    //public but u can just try{}catch(){} the constructor it still calls this method
+    private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
+        long amount = 0;
+        for (EMDefinitionStack aspects : stacks.valuesToArray()) {
+            if (!(aspects.getDefinition() instanceof EMComplexAspectDefinition) && !(aspects.getDefinition() instanceof EMPrimalAspectDefinition)) {
+                return false;
+            }
+            if((int) aspects.getAmount() != aspects.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            amount += aspects.getAmount();
+        }
+        return amount == 2;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this);
+        if (name != null) {
+            name = name.substring(0, 1).toUpperCase() + name.substring(1);
+        } else {
+            name = getSymbol();
+        }
+        return translateToLocal("tt.keyword.Aspect") + ": " + name;
+    }
+
+    @Override
+    public String getSymbol() {
+        StringBuilder symbol = new StringBuilder(8);
+        for (EMDefinitionStack aspect : aspectStacks.valuesToArray()) {
+            if (aspect.getDefinition() instanceof EMPrimalAspectDefinition) {
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getSymbol());
+                }
+            } else {
+                symbol.append('(');
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getSymbol());
+                }
+                symbol.append(')');
+            }
+        }
+        return symbol.toString();
+    }
+
+    @Override
+    public String getShortSymbol() {
+        StringBuilder symbol = new StringBuilder(8);
+        for (EMDefinitionStack aspect : aspectStacks.valuesToArray()) {
+            if (aspect.getDefinition() instanceof EMPrimalAspectDefinition) {
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getShortSymbol());
+                }
+            } else {
+                symbol.append('(');
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getShortSymbol());
+                }
+                symbol.append(')');
+            }
+        }
+        return symbol.toString();
+    }
+
+    @Override
+    public NBTTagCompound toNBT() {
+        return getNbtTagCompound(nbtType, aspectStacks);
+    }
+
+    public static NBTTagCompound getNbtTagCompound(byte nbtType, EMConstantStackMap aspectStacks) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setByte("t", nbtType);
+        EMDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
+        nbt.setInteger("i", quarkStacksValues.length);
+        for (int i = 0; i < quarkStacksValues.length; i++) {
+            nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
+        }
+        return nbt;
+    }
+
+    public static EMComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
+        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < stacks.length; i++) {
+            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+        }
+        try {
+            return new EMComplexAspectDefinition(stacks);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return -1;
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+
+    @Override
+    public int getCharge() {
+        return 0;
+    }
+
+    @Override
+    public byte getType() {
+        return 0;
+    }
+
+    @Override
+    public byte getColor() {
+        return -1;
+    }
+
+    @Override
+    public EMConstantStackMap getSubParticles() {
+        return aspectStacks;
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        return new EMDecay[]{new EMDecay(0.75F, aspectStacks), EMBosonDefinition.deadEnd};
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        return NO_DECAY;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        return NO_DECAY;
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public IEMDefinition getAnti() {
+        return null;
+    }
+
+    public static void run() {
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if (DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96);
+        }
+    }
+
+    @Override
+    public byte getClassType() {
+        return -96;
+    }
+
+    public static byte getClassTypeStatic() {
+        return -96;
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType());
+        }
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.NAME") + " = " + getLocalizedName());
+            //lines.add("SYMBOL = "+getSymbol());
+        }
+        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
+        }
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add(getColor() < 0 ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
+        }
+        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
+        }
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(translateToLocal("tt.keyphrase.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s");
+            lines.add("    " + translateToLocal("tt.keyphrase.At_current_energy_level"));
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
new file mode 100644
index 0000000000..bf9703d6d7
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -0,0 +1,42 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by Tec on 06.05.2017.
+ */
+public final class EMPrimalAspectDefinition extends EMPrimitive {
+    public static final EMPrimalAspectDefinition
+            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
+            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
+            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 33),
+            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 32),
+            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 30),
+            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Entropy"), "e`", 1e5D, 31);
+
+    private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID) {
+        super(name, symbol, 0, mass, 0, -1, ID);
+    }
+
+    public static void run() {
+        magic_air.init(null, -1F, -1, -1, NO_DECAY);
+        magic_earth.init(null, -1F, -1, -1, NO_DECAY);
+        magic_fire.init(null, -1F, -1, -1, NO_DECAY);
+        magic_water.init(null, -1F, -1, -1, NO_DECAY);
+        magic_order.init(null, -1F, -1, -1, NO_DECAY);
+        magic_entropy.init(null, -1F, -1, -1, NO_DECAY);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.Primal") + ": " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
deleted file mode 100644
index 98ad5bbf63..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
+++ /dev/null
@@ -1,308 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
-import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by Tec on 06.05.2017.
- */
-public final class dComplexAspectDefinition extends cElementalDefinition {
-    private final int hash;
-    public final double mass;
-
-    private static final byte nbtType = (byte) 'c';
-
-    private final cElementalConstantStackMap aspectStacks;
-
-    public dComplexAspectDefinition(cElementalDefinitionStack... aspects) throws tElementalException {
-        this(true, new cElementalConstantStackMap(aspects));
-    }
-
-    private dComplexAspectDefinition(boolean check, cElementalDefinitionStack... aspects) throws tElementalException {
-        this(check, new cElementalConstantStackMap(aspects));
-    }
-
-    public dComplexAspectDefinition(cElementalConstantStackMap aspects) throws tElementalException {
-        this(true, aspects);
-    }
-
-    private dComplexAspectDefinition(boolean check, cElementalConstantStackMap aspects) throws tElementalException {
-        if (check && !canTheyBeTogether(aspects)) {
-            throw new tElementalException("Hadron Definition error");
-        }
-        aspectStacks = aspects;
-        float mass = 0;
-        for (cElementalDefinitionStack stack : aspects.valuesToArray()) {
-            mass += stack.getMass();
-        }
-        this.mass = mass;
-        hash = super.hashCode();
-    }
-
-    //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
-        long amount = 0;
-        for (cElementalDefinitionStack aspects : stacks.valuesToArray()) {
-            if (!(aspects.definition instanceof dComplexAspectDefinition) && !(aspects.definition instanceof ePrimalAspectDefinition)) {
-                return false;
-            }
-            if((int)aspects.amount!=aspects.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            amount += aspects.amount;
-        }
-        return amount == 2;
-    }
-
-    @Override
-    public String getName() {
-        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this);
-        if (name != null) {
-            name = name.substring(0, 1).toUpperCase() + name.substring(1);
-        } else {
-            name = getSymbol();
-        }
-        return translateToLocal("tt.keyword.Aspect") + ": " + name;
-    }
-
-    @Override
-    public String getSymbol() {
-        StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
-            if (aspect.definition instanceof ePrimalAspectDefinition) {
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getSymbol());
-                }
-            } else {
-                symbol.append('(');
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getSymbol());
-                }
-                symbol.append(')');
-            }
-        }
-        return symbol.toString();
-    }
-
-    @Override
-    public String getShortSymbol() {
-        StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
-            if (aspect.definition instanceof ePrimalAspectDefinition) {
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getShortSymbol());
-                }
-            } else {
-                symbol.append('(');
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getShortSymbol());
-                }
-                symbol.append(')');
-            }
-        }
-        return symbol.toString();
-    }
-
-    @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, aspectStacks);
-    }
-
-    public static NBTTagCompound getNbtTagCompound(byte nbtType, cElementalConstantStackMap aspectStacks) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        cElementalDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
-        nbt.setInteger("i", quarkStacksValues.length);
-        for (int i = 0; i < quarkStacksValues.length; i++) {
-            nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
-        }
-        return nbt;
-    }
-
-    public static dComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new dComplexAspectDefinition(stacks);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return -1;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return false;
-    }
-
-    @Override
-    public int getCharge() {
-        return 0;
-    }
-
-    @Override
-    public byte getType() {
-        return 0;
-    }
-
-    @Override
-    public byte getColor() {
-        return -1;
-    }
-
-    @Override
-    public cElementalConstantStackMap getSubParticles() {
-        return aspectStacks;
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        return new cElementalDecay[]{new cElementalDecay(0.75F, aspectStacks), eBosonDefinition.deadEnd};
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        return noDecay;
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        return noDecay;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public iElementalDefinition getAnti() {
-        return null;
-    }
-
-    public static void run() {
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if (DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96);
-        }
-    }
-
-    @Override
-    public byte getClassType() {
-        return -96;
-    }
-
-    public static byte getClassTypeStatic() {
-        return -96;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType());
-        }
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.NAME") + " = " + getName());
-            //lines.add("SYMBOL = "+getSymbol());
-        }
-        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
-        }
-        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
-            lines.add(getColor() < 0 ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
-        }
-        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
-        }
-        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(translateToLocal("tt.keyphrase.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s");
-            lines.add("    " + translateToLocal("tt.keyphrase.At_current_energy_level"));
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
deleted file mode 100644
index 5db067a552..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by Tec on 06.05.2017.
- */
-public final class ePrimalAspectDefinition extends cElementalPrimitive {
-    public static final ePrimalAspectDefinition
-            magic_air = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
-            magic_earth = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
-            magic_fire = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 33),
-            magic_water = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 32),
-            magic_order = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 30),
-            magic_entropy = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Entropy"), "e`", 1e5D, 31);
-
-    private ePrimalAspectDefinition(String name, String symbol, double mass, int ID) {
-        super(name, symbol, 0, mass, 0, -1, ID);
-    }
-
-    public static void run() {
-        magic_air.init(null, -1F, -1, -1, noDecay);
-        magic_earth.init(null, -1F, -1, -1, noDecay);
-        magic_fire.init(null, -1F, -1, -1, noDecay);
-        magic_water.init(null, -1F, -1, -1, noDecay);
-        magic_order.init(null, -1F, -1, -1, noDecay);
-        magic_entropy.init(null, -1F, -1, -1, noDecay);
-    }
-
-    @Override
-    public String getName() {
-        return translateToLocal("tt.keyword.Primal") + ": " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
index 343071e26e..c7f38eb21d 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
 
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 
 import java.util.HashMap;
 
@@ -9,21 +9,25 @@ import java.util.HashMap;
  * Created by Tec on 21.05.2017.
  */
 public class AspectDefinitionCompat {
-    public static AspectDefinitionCompat aspectDefinitionCompat;
-    public final HashMap<iElementalDefinition,String> defToAspect = new HashMap<>();
-    public final HashMap<String,iElementalDefinition> aspectToDef = new HashMap<>();
+    public static AspectDefinitionCompat         aspectDefinitionCompat;
+    private final HashMap<IEMDefinition,String>  defToAspect = new HashMap<>();
+    private final HashMap<String, IEMDefinition> aspectToDef = new HashMap<>();
 
     public void run(){}
 
-    public Object getAspect(iElementalDefinition definition){
+    public String getAspectTag(IEMDefinition definition){
         return null;
     }
 
-    public String getAspectTag(iElementalDefinition definition){
+    public IEMDefinition getDefinition(String aspect){
         return null;
     }
 
-    public iElementalDefinition getDefinition(String aspect){
-        return null;
+    public HashMap<IEMDefinition, String> getDefToAspect() {
+        return defToAspect;
+    }
+
+    public HashMap<String, IEMDefinition> getAspectToDef() {
+        return aspectToDef;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
index 446e9b66d5..c9ca5d7b9f 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -1,13 +1,13 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
 
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import thaumcraft.api.aspects.Aspect;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*;
 import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
 
 /**
@@ -16,19 +16,19 @@ import static com.github.technus.tectech.thing.item.DebugElementalInstanceContai
 public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
     @Override
     public void run(){
-        defToAspect.put(magic_air,"aer");
-        defToAspect.put(magic_earth,"terra");
-        defToAspect.put(magic_fire,"ignis");
-        defToAspect.put(magic_water,"aqua");
-        defToAspect.put(magic_order,"ordo");
-        defToAspect.put(magic_entropy,"perditio");
+        getDefToAspect().put(magic_air,"aer");
+        getDefToAspect().put(magic_earth,"terra");
+        getDefToAspect().put(magic_fire,"ignis");
+        getDefToAspect().put(magic_water,"aqua");
+        getDefToAspect().put(magic_order,"ordo");
+        getDefToAspect().put(magic_entropy,"perditio");
 
-        aspectToDef.put("aer",magic_air);
-        aspectToDef.put("terra",magic_earth);
-        aspectToDef.put("ignis",magic_fire);
-        aspectToDef.put("aqua",magic_water);
-        aspectToDef.put("ordo",magic_order);
-        aspectToDef.put("perditio",magic_entropy);
+        getAspectToDef().put("aer",magic_air);
+        getAspectToDef().put("terra",magic_earth);
+        getAspectToDef().put("ignis",magic_fire);
+        getAspectToDef().put("aqua",magic_water);
+        getAspectToDef().put("ordo",magic_order);
+        getAspectToDef().put("perditio",magic_entropy);
 
         ArrayList<Aspect> list=Aspect.getCompoundAspects();
         Aspect[] array= list.toArray(new Aspect[0]);
@@ -38,20 +38,20 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                     Aspect[] content = aspect.getComponents();
                     if (content.length != 2) {
                         list.remove(aspect);
-                    }else if(aspectToDef.containsKey(content[0].getTag()) && aspectToDef.containsKey(content[1].getTag())){
+                    }else if(getAspectToDef().containsKey(content[0].getTag()) && getAspectToDef().containsKey(content[1].getTag())){
                         try {
-                            dComplexAspectDefinition newAspect;
+                            EMComplexAspectDefinition newAspect;
                             if(content[0].getTag().equals(content[1].getTag())){
-                                newAspect = new dComplexAspectDefinition(
-                                        aspectToDef.get(content[0].getTag()).getStackForm(2));
+                                newAspect = new EMComplexAspectDefinition(
+                                        getAspectToDef().get(content[0].getTag()).getStackForm(2));
                             }else{
-                                newAspect = new dComplexAspectDefinition(
-                                        aspectToDef.get(content[0].getTag()).getStackForm(1),
-                                        aspectToDef.get(content[1].getTag()).getStackForm(1));
+                                newAspect = new EMComplexAspectDefinition(
+                                        getAspectToDef().get(content[0].getTag()).getStackForm(1),
+                                        getAspectToDef().get(content[1].getTag()).getStackForm(1));
                             }
-                            aspectToDef.put(aspect.getTag(),newAspect);
-                            defToAspect.put(newAspect,aspect.getTag());
-                        }catch (tElementalException e) {
+                            getAspectToDef().put(aspect.getTag(),newAspect);
+                            getDefToAspect().put(newAspect,aspect.getTag());
+                        }catch (EMException e) {
                             /**/
                         }finally {
                             list.remove(aspect);
@@ -60,22 +60,16 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                 }
             }
         }
-
-        STACKS_REGISTERED.addAll(defToAspect.keySet());
-    }
-
-    @Override
-    public Aspect getAspect(iElementalDefinition definition) {
-        return Aspect.getAspect(defToAspect.get(definition));
+        STACKS_REGISTERED.addAll(getDefToAspect().keySet());
     }
 
     @Override
-    public String getAspectTag(iElementalDefinition definition) {
-        return defToAspect.get(definition);
+    public String getAspectTag(IEMDefinition definition) {
+        return getDefToAspect().get(definition);
     }
 
     @Override
-    public iElementalDefinition getDefinition(String aspect) {
-        return aspectToDef.get(aspect);
+    public IEMDefinition getDefinition(String aspect) {
+        return getAspectToDef().get(aspect);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
index 63f55912a6..d51bc8dc2d 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 
@@ -18,7 +18,7 @@ public class EssentiaCompat {
         return null;
     }
 
-    public String getEssentiaName(iElementalDefinition stack){
+    public String getEssentiaName(IEMDefinition stack){
         return null;
     }
 
@@ -26,7 +26,7 @@ public class EssentiaCompat {
         return false;
     }
 
-    public iElementalDefinition getFromContainer(TileEntity container){
+    public IEMDefinition getFromContainer(TileEntity container){
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
index 03ff92b4e0..ab682ba1a5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 import thaumcraft.api.aspects.Aspect;
@@ -28,8 +28,8 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
     }
 
     @Override
-    public String getEssentiaName(iElementalDefinition stack) {
-        return aspectDefinitionCompat.defToAspect.get(stack);
+    public String getEssentiaName(IEMDefinition stack) {
+        return aspectDefinitionCompat.getDefToAspect().get(stack);
     }
 
     @Override
@@ -49,7 +49,7 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
     }
 
     @Override
-    public iElementalDefinition getFromContainer(TileEntity container){
+    public IEMDefinition getFromContainer(TileEntity container){
         if(container==null || container.isInvalid()) {
             return null;
         }
@@ -59,7 +59,7 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
                 Aspect[] aspectsArr= aspects.getAspects();
                 if(aspectsArr!=null && aspectsArr[0]!=null){
                      if (((IAspectContainer) container).takeFromContainer(aspectsArr[0],1)){
-                         return aspectDefinitionCompat.aspectToDef.get(aspectsArr[0].getTag());
+                         return aspectDefinitionCompat.getAspectToDef().get(aspectsArr[0].getTag());
                      }
                 }
             }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index c939f10d6b..dbcbe7d86b 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -26,8 +26,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -94,24 +94,24 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             return false;
         }
 
-        cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContentHandler();
+        EMInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContentHandler();
         if (inputHatchContainer == null || !inputHatchContainer.hasStacks()) {
             return false;
         }
 
-        cElementalInstanceStack stack = inputHatchContainer.getRandom();
-        if (stack.amount < AVOGADRO_CONSTANT_DIMINISHED) {
-            cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+        EMInstanceStack stack = inputHatchContainer.getRandom();
+        if (stack.getAmount() < AVOGADRO_CONSTANT_DIMINISHED) {
+            cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
             mEUt = (int) -V[6];
         } else {
-            outputEssentiaName = essentiaContainerCompat.getEssentiaName(stack.definition);
+            outputEssentiaName = essentiaContainerCompat.getEssentiaName(stack.getDefinition());
             Aspect aspect = Aspect.getAspect(outputEssentiaName);
             if (aspect == null) {
                 outputEssentiaName = null;
-                cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+                cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
                 mEUt = (int) -V[7];
             } else {
-                inputHatchContainer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+                inputHatchContainer.removeAmount(stack.getDefinition().getStackForm(AVOGADRO_CONSTANT));
                 if (aspect.isPrimal()) {
                     mEUt = (int) -V[8];
                 } else {
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 62ac339155..5606442c37 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -1,11 +1,11 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -25,7 +25,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -84,15 +84,15 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
-        iElementalDefinition definition  = essentiaContainerCompat.getFromContainer(essentiaContainerCompat.getContainer(this));
+        IEMDefinition definition = essentiaContainerCompat.getFromContainer(essentiaContainerCompat.getContainer(this));
         if (definition != null) {
             mMaxProgresstime = 20;
             mEfficiencyIncrease = 10000;
             eAmpereFlow = 1;
-            outputEM = new cElementalInstanceStackMap[]{
-                    new cElementalInstanceStackMap(new cElementalInstanceStack(definition,AVOGADRO_CONSTANT))
+            outputEM = new EMInstanceStackMap[]{
+                    new EMInstanceStackMap(new EMInstanceStack(definition,AVOGADRO_CONSTANT))
             };
-            if (definition instanceof ePrimalAspectDefinition) {
+            if (definition instanceof EMPrimalAspectDefinition) {
                 mEUt = (int) -V[8];
             } else {
                 mEUt = (int) -V[10];
diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index b481b82646..7ce371e57e 100644
--- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -1,11 +1,11 @@
 package com.github.technus.tectech.loader;
 
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.iaeaNuclide;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMNuclideIAEA;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.*;
 
 /**
@@ -18,23 +18,23 @@ public class ElementalLoader implements Runnable {
         // Definition init
         // ===================================================================================================
 
-        cElementalPrimitive.run();
+        EMPrimitive.run();
 
-        cPrimitiveDefinition.run();
+        EMPrimitiveDefinition.run();
 
-        eQuarkDefinition.run();
-        eLeptonDefinition.run();
-        eNeutrinoDefinition.run();
-        eBosonDefinition.run();
+        EMQuarkDefinition.run();
+        EMLeptonDefinition.run();
+        EMNeutrinoDefinition.run();
+        EMBosonDefinition.run();
 
-        dHadronDefinition.run();
+        EMHadronDefinition.run();
 
-        iaeaNuclide.run();
+        EMNuclideIAEA.run();
 
-        dAtomDefinition.run();
+        EMAtomDefinition.run();
 
-        ePrimalAspectDefinition.run();
+        EMPrimalAspectDefinition.run();
 
-        dComplexAspectDefinition.run();
+        EMComplexAspectDefinition.run();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
index 8165cd7fec..3572e601e4 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.loader.recipe;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader;
 import com.github.technus.tectech.compatibility.spartakcore.SpartakCoreRecipeLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
@@ -35,8 +35,8 @@ public class RecipeLoader implements Runnable {
 
     @Override
     public void run() {
-        dAtomDefinition.setTransformation();
-        dHadronDefinition.setTransformations();
+        EMAtomDefinition.setTransformation();
+        EMHadronDefinition.setTransformations();
 
         // ===================================================================================================
         // Recipes init - common goes here rest goes into methods below
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index 91dbffa71f..b3df7483f5 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -15,7 +15,7 @@ import cpw.mods.fml.common.Loader;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.CustomItemList.*;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index 0e1771e88d..c6ac34b66d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -7,7 +7,7 @@ import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
 import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
 import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import gregtech.api.GregTech_API;
@@ -31,11 +31,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
-    private static final double SWAP_THRESHOLD = dAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
+    private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
     private static final int COUNT_DIV=32;
     private static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
     private static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
new file mode 100644
index 0000000000..23ca5d77d9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
@@ -0,0 +1,10 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core;
+
+/**
+ * Created by danie_000 on 19.11.2016.
+ */
+public final class EMException extends Exception {
+    public EMException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java
new file mode 100644
index 0000000000..d731078988
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java
@@ -0,0 +1,12 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+
+/**
+ * Created by danie_000 on 25.01.2017.
+ */
+public interface IEMContainer {
+    EMInstanceStackMap getContentHandler();
+
+    void purgeOverflow();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
new file mode 100644
index 0000000000..64e9bcea1e
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -0,0 +1,160 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentText;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 30.12.2017.
+ */
+public class EMGive implements ICommand {
+    ArrayList<String> aliases=new ArrayList<>();
+
+    public EMGive(){
+        aliases.add("em_give");
+        aliases.add("give_em");
+        aliases.add("gib_em");
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (sender instanceof EntityPlayerMP && !sender.getEntityWorld().isRemote) {
+            if(args.length < 3) {
+                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
+            }else{
+                TecTech.LOGGER.info("Spawninig EM for "+((EntityPlayerMP) sender).getDisplayName()+" - "+Arrays.toString(args));
+
+                ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
+                String energy=list.remove(0);
+
+                EMDefinitionStack def = getDefinitionStack(list);
+                if(def!=null) {
+                    EMInstanceStack instanceStack = new EMInstanceStack(def, 1D, 0D, Long.parseLong(energy));
+
+                    sender.addChatMessage(new ChatComponentText(instanceStack.getDefinition().getSymbol() + " - " + instanceStack.getDefinition().getLocalizedName()));
+
+                    EMInstanceStackMap instanceMap = new EMInstanceStackMap(instanceStack);
+
+                    ItemStack itemStack = new ItemStack(DebugElementalInstanceContainer_EM.INSTANCE);
+                    NBTTagCompound contents = new NBTTagCompound();
+                    contents.setTag("info", instanceMap.getInfoNBT());
+                    contents.setTag("content", instanceMap.toNBT());
+                    itemStack.setTagCompound(contents);
+
+                    ((EntityPlayerMP) sender).inventory.addItemStackToInventory(itemStack);
+                }
+            }
+        }
+    }
+
+    private EMDefinitionStack getDefinitionStack(ArrayList<String> args){
+        if(args.get(0).equals("<")){
+            args.remove(0);
+            return null;
+        }
+        double amount=Double.parseDouble(args.remove(0));
+        try{
+            int id=Integer.parseInt(args.get(0));
+            args.remove(0);
+            IEMDefinition primitive = EMPrimitive.getBindsPrimitive().get(id);
+            return new EMDefinitionStack(primitive,amount);
+        }catch (NumberFormatException e){
+            byte clazz = (byte) args.remove(0).charAt(0);
+            Method constructor = EMComplex.getBindsComplex().get(clazz);
+
+            EMDefinitionStackMap stacks =new EMDefinitionStackMap();
+            while(args.size()>0){
+                EMDefinitionStack tempStack =getDefinitionStack(args);
+                if(tempStack==null) {
+                    break;
+                }else {
+                    stacks.putUnifyExact(tempStack);
+                }
+            }
+
+            try {
+                return ((IEMDefinition) constructor.invoke(null, stacks.toNBT())).getStackForm(amount);
+            } catch (Exception e1) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return nbtE__.getStackForm(amount);
+            }
+        }
+    }
+
+    @Override
+    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
+        return false;
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return aliases;
+    }
+
+    @Override
+    public String getCommandName() {
+        return aliases.get(0);
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        if(args.length==2){
+            return completionsForClassOrID();
+        }
+        return null;
+    }
+
+    private List<String> completionsForClassOrID(){
+        ArrayList<String> strings=new ArrayList<>(8);
+        Map<Byte,Method> binds= EMComplex.getBindsComplex();
+        for (Map.Entry<Byte,Method> e:binds.entrySet()) {
+            strings.add(String.valueOf((char)e.getKey().byteValue()));
+        }
+        Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
+        for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+            strings.add(String.valueOf(e.getKey().byteValue()));
+        }
+        return strings;
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender p_71518_1_) {
+        return "em_give Energy Count ClassOrId (Count ClassOrId ... <)";
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        if(o instanceof ICommand){
+            return getCommandName().compareTo(((ICommand) o).getCommandName());
+        }
+        return 0;
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
new file mode 100644
index 0000000000..395592036f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -0,0 +1,95 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by danie_000 on 30.12.2017.
+ */
+public class EMList implements ICommand {
+    ArrayList<String> aliases=new ArrayList<>();
+
+    public EMList(){
+        aliases.add("em_list");
+        aliases.add("list_em");
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (!sender.getEntityWorld().isRemote) {
+            if(args.length == 0) {
+                sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
+                Map<Byte,Method> binds= EMComplex.getBindsComplex();
+                for (Map.Entry<Byte,Method> e:binds.entrySet()) {
+                    sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
+                }
+            }else if(args.length==1){
+                sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
+                if(args[0].equals(String.valueOf((char) EMPrimitive.nbtType))){
+                    Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
+                    for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+                        sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getLocalizedName()));
+                    }
+                }else{
+                    sender.addChatMessage(new ChatComponentText("Complex definition - needs contents"));
+                }
+            }else{
+                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
+            }
+        }
+    }
+
+    @Override
+    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
+        return false;
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return aliases;
+    }
+
+    @Override
+    public String getCommandName() {
+        return aliases.get(0);
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        if(args.length==0){
+            Map<Byte,Method> binds= EMComplex.getBindsComplex();
+            ArrayList<String> strings=new ArrayList<>(binds.size());
+            for (Map.Entry<Byte,Method> e:binds.entrySet()) {
+                strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
+            }
+            return strings;
+        }
+        return null;
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender p_71518_1_) {
+        return "em_list (optional class tag)";
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        if(o instanceof ICommand){
+            return getCommandName().compareTo(((ICommand) o).getCommandName());
+        }
+        return 0;
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
deleted file mode 100644
index 8b1f6d0c14..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentText;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 30.12.2017.
- */
-public class GiveEM implements ICommand {
-    ArrayList<String> aliases=new ArrayList<>();
-
-    public GiveEM(){
-        aliases.add("em_give");
-        aliases.add("give_em");
-        aliases.add("gib_em");
-    }
-
-    @Override
-    public void processCommand(ICommandSender sender, String[] args) {
-        if (sender instanceof EntityPlayerMP && !sender.getEntityWorld().isRemote) {
-            if(args.length < 3) {
-                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
-            }else{
-                TecTech.LOGGER.info("Spawninig EM for "+((EntityPlayerMP) sender).getDisplayName()+" - "+Arrays.toString(args));
-
-                ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
-                String energy=list.remove(0);
-
-                cElementalDefinitionStack def= getDefinitionStack(list);
-                if(def!=null) {
-                    cElementalInstanceStack instanceStack = new cElementalInstanceStack(def, 1D, 0D, Long.parseLong(energy));
-
-                    sender.addChatMessage(new ChatComponentText(instanceStack.definition.getSymbol() + " - " + instanceStack.definition.getName()));
-
-                    cElementalInstanceStackMap instanceMap = new cElementalInstanceStackMap(instanceStack);
-
-                    ItemStack itemStack = new ItemStack(DebugElementalInstanceContainer_EM.INSTANCE);
-                    NBTTagCompound contents = new NBTTagCompound();
-                    contents.setTag("info", instanceMap.getInfoNBT());
-                    contents.setTag("content", instanceMap.toNBT());
-                    itemStack.setTagCompound(contents);
-
-                    ((EntityPlayerMP) sender).inventory.addItemStackToInventory(itemStack);
-                }
-            }
-        }
-    }
-
-    private cElementalDefinitionStack getDefinitionStack(ArrayList<String> args){
-        if(args.get(0).equals("<")){
-            args.remove(0);
-            return null;
-        }
-        double amount=Double.parseDouble(args.remove(0));
-        try{
-            int id=Integer.parseInt(args.get(0));
-            args.remove(0);
-            iElementalDefinition primitive=cElementalPrimitive.getBindsPrimitive().get(id);
-            return new cElementalDefinitionStack(primitive,amount);
-        }catch (NumberFormatException e){
-            byte clazz = (byte) args.remove(0).charAt(0);
-            Method constructor = cElementalDefinition.getBindsComplex().get(clazz);
-
-            cElementalDefinitionStackMap stacks =new cElementalDefinitionStackMap();
-            while(args.size()>0){
-                cElementalDefinitionStack tempStack=getDefinitionStack(args);
-                if(tempStack==null) {
-                    break;
-                }else {
-                    stacks.putUnify(tempStack);
-                }
-            }
-
-            try {
-                return ((iElementalDefinition) constructor.invoke(null, stacks.toNBT())).getStackForm(amount);
-            } catch (Exception e1) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return nbtE__.getStackForm(amount);
-            }
-        }
-    }
-
-    @Override
-    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
-        return false;
-    }
-
-    @Override
-    public List<String> getCommandAliases() {
-        return aliases;
-    }
-
-    @Override
-    public String getCommandName() {
-        return aliases.get(0);
-    }
-
-    @Override
-    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==2){
-            return completionsForClassOrID();
-        }
-        return null;
-    }
-
-    private List<String> completionsForClassOrID(){
-        ArrayList<String> strings=new ArrayList<>(8);
-        Map<Byte,Method> binds= cElementalDefinition.getBindsComplex();
-        for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-            strings.add(String.valueOf((char)e.getKey().byteValue()));
-        }
-        Map<Integer, cElementalPrimitive> bindsBO = cElementalPrimitive.getBindsPrimitive();
-        for (Map.Entry<Integer,cElementalPrimitive> e:bindsBO.entrySet()) {
-            strings.add(String.valueOf(e.getKey().byteValue()));
-        }
-        return strings;
-    }
-
-    @Override
-    public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_give Energy Count ClassOrId (Count ClassOrId ... <)";
-    }
-
-    @Override
-    public int compareTo(Object o) {
-        if(o instanceof ICommand){
-            return getCommandName().compareTo(((ICommand) o).getCommandName());
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean canCommandSenderUseCommand(ICommandSender sender) {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java
deleted file mode 100644
index 20110c0b0d..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.util.ChatComponentText;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by danie_000 on 30.12.2017.
- */
-public class ListEM implements ICommand {
-    ArrayList<String> aliases=new ArrayList<>();
-
-    public ListEM(){
-        aliases.add("em_list");
-        aliases.add("list_em");
-    }
-
-    @Override
-    public void processCommand(ICommandSender sender, String[] args) {
-        if (!sender.getEntityWorld().isRemote) {
-            if(args.length == 0) {
-                sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
-                Map<Byte,Method> binds= cElementalDefinition.getBindsComplex();
-                for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                    sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
-                }
-            }else if(args.length==1){
-                sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
-                if(args[0].equals(String.valueOf((char)cElementalPrimitive.nbtType))){
-                    Map<Integer, cElementalPrimitive> bindsBO = cElementalPrimitive.getBindsPrimitive();
-                    for (Map.Entry<Integer,cElementalPrimitive> e:bindsBO.entrySet()) {
-                        sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getName()));
-                    }
-                }else{
-                    sender.addChatMessage(new ChatComponentText("Complex definition - needs contents"));
-                }
-            }else{
-                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
-            }
-        }
-    }
-
-    @Override
-    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
-        return false;
-    }
-
-    @Override
-    public List<String> getCommandAliases() {
-        return aliases;
-    }
-
-    @Override
-    public String getCommandName() {
-        return aliases.get(0);
-    }
-
-    @Override
-    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==0){
-            Map<Byte,Method> binds= cElementalDefinition.getBindsComplex();
-            ArrayList<String> strings=new ArrayList<>(binds.size());
-            for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
-            }
-            return strings;
-        }
-        return null;
-    }
-
-    @Override
-    public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_list (optional class tag)";
-    }
-
-    @Override
-    public int compareTo(Object o) {
-        if(o instanceof ICommand){
-            return getCommandName().compareTo(((ICommand) o).getCommandName());
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean canCommandSenderUseCommand(ICommandSender sender) {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
new file mode 100644
index 0000000000..bed49a5040
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
@@ -0,0 +1,90 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+
+import static com.github.technus.tectech.util.DoubleCount.mul;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMDecay {
+    public static final EMDecay[]                  NO_DECAY   = null;
+    //DECAY IMPOSSIBLE!!!
+    //Do not use regular NULL java will not make it work with varargs!!!
+    //Or cast null into ARRAY type but this static is more convenient!!!
+    public static final EMDecay[]          NO_PRODUCT = new EMDecay[0];
+    //this in turn can be used to tell that the thing should just vanish
+    private final EMConstantStackMap outputStacks;
+    private final double             probability;
+
+    public EMDecay(IEMDefinition... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public EMDecay(double probability, IEMDefinition... outSafe) {
+        EMDefinitionStack[] outArr = new EMDefinitionStack[outSafe.length];
+        for (int i = 0; i < outArr.length; i++) {
+            outArr[i] = new EMDefinitionStack(outSafe[i], 1D);
+        }
+        outputStacks = new EMConstantStackMap(outArr);
+        this.probability = probability;
+    }
+
+    public EMDecay(EMDefinitionStack... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public EMDecay(double probability, EMDefinitionStack... out) {
+        outputStacks = new EMConstantStackMap(out);
+        this.probability = probability;
+    }
+
+    public EMDecay(EMConstantStackMap tree) {
+        this(1D, tree);
+    }
+
+    public EMDecay(double probability, EMConstantStackMap tree) {
+        outputStacks = tree;
+        this.probability = probability;
+    }
+
+    public EMInstanceStackMap getResults(double lifeMult, double age, long newEnergyLevel, double amountDecaying) {
+        EMInstanceStackMap decayResult = new EMInstanceStackMap();
+        if (getOutputStacks() == null) {
+            return decayResult;//This is to prevent null pointer exceptions.
+        }
+        //Deny decay code is in instance!
+        boolean empty=true;
+        for (EMDefinitionStack stack : getOutputStacks().valuesToArray()) {
+            if(stack.getAmount() >0){
+                empty=false;
+                break;
+            }
+        }
+        if (empty) {
+            return decayResult;
+        }
+        //newEnergyLevel /= qtty;
+        //lifeMult /= (float) qtty;
+        for (EMDefinitionStack stack : getOutputStacks().valuesToArray()) {
+            decayResult.putUnify(new EMInstanceStack(stack.getDefinition(),
+                    mul(amountDecaying, stack.getAmount()),
+                    lifeMult,
+                    age/*new products*/,
+                    (long)(newEnergyLevel / Math.max(1D, Math.abs(stack.getAmount())))));//get instances from stack
+        }
+        return decayResult;
+    }
+
+    public EMConstantStackMap getOutputStacks() {
+        return outputStacks;
+    }
+
+    public double getProbability() {
+        return probability;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java
new file mode 100644
index 0000000000..0a00a519f9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java
@@ -0,0 +1,45 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+
+public class EMDecayResult {
+    private final EMInstanceStackMap output;
+    private       double massAffected;
+    private       double massDiff;
+
+    public EMDecayResult(EMInstanceStackMap output, double massAffected, double massDiff) {
+        this.output = output;
+        this.massAffected = massAffected;
+        this.massDiff = massDiff;
+    }
+
+    public EMInstanceStackMap getOutput() {
+        return output;
+    }
+
+    /**
+     * How much was lost in the process (decayed or removed)
+     *
+     * @return
+     */
+    public double getMassAffected() {
+        return massAffected;
+    }
+
+    /**
+     * Difference of mass of actually decayed elements
+     *
+     * @return
+     */
+    public double getMassDiff() {
+        return massDiff;
+    }
+
+    public void setMassAffected(double massAffected) {
+        this.massAffected = massAffected;
+    }
+
+    public void setMassDiff(double massDiff) {
+        this.massDiff = massDiff;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
deleted file mode 100644
index 79103f7fa0..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cElementalDecay {
-    public static final cElementalDecay[] noDecay = null;
-    //DECAY IMPOSSIBLE!!!
-    //Do not use regular NULL java will not make it work with varargs!!!
-    //Or cast null into ARRAY type but this static is more convenient!!!
-    public static final cElementalDecay[]          noProduct = new cElementalDecay[0];
-    //this in turn can be used to tell that the thing should just vanish
-    public final        cElementalConstantStackMap outputStacks;
-    public final        double                     probability;
-
-    public cElementalDecay(iElementalDefinition... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, iElementalDefinition... outSafe) {
-        cElementalDefinitionStack[] outArr = new cElementalDefinitionStack[outSafe.length];
-        for (int i = 0; i < outArr.length; i++) {
-            outArr[i] = new cElementalDefinitionStack(outSafe[i], 1D);
-        }
-        outputStacks = new cElementalConstantStackMap(outArr);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalDefinitionStack... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, cElementalDefinitionStack... out) {
-        outputStacks = new cElementalConstantStackMap(out);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalConstantStackMap tree) {
-        this(1D, tree);
-    }
-
-    public cElementalDecay(double probability, cElementalConstantStackMap tree) {
-        outputStacks = tree;
-        this.probability = probability;
-    }
-
-    public cElementalInstanceStackMap getResults(double lifeMult, double age, long energyTotalForProducts, double amountDecaying) {
-        cElementalInstanceStackMap decayResult = new cElementalInstanceStackMap();
-        if (outputStacks == null) {
-            return decayResult;//This is to prevent null pointer exceptions.
-        }
-        //Deny decay code is in instance!
-        double qtty = 0D;
-        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
-            qtty= add(qtty,stack.amount);
-        }
-        if (qtty <= 0D) {
-            return decayResult;
-        }
-        //energyTotalForProducts /= qtty;
-        //lifeMult /= (float) qtty;
-        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
-            decayResult.putUnify(new cElementalInstanceStack(stack.definition,
-                    amountDecaying * stack.amount,
-                    lifeMult, age/*new products*/, (long)(energyTotalForProducts / Math.max(1D, Math.abs(stack.amount)))));//get instances from stack
-        }
-        return decayResult;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
deleted file mode 100644
index 43f4341720..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-
-public class cElementalDecayResult {
-    private final cElementalInstanceStackMap output;
-    private       double                     massAffected;
-    private       double                     massDiff;
-
-    public cElementalDecayResult(cElementalInstanceStackMap output, double massAffected, double massDiff) {
-        this.output = output;
-        this.massAffected = massAffected;
-        this.massDiff = massDiff;
-    }
-
-    public cElementalInstanceStackMap getOutput() {
-        return output;
-    }
-
-    /**
-     * How much was lost in the process (decayed or removed)
-     * @return
-     */
-    public double getMassAffected() {
-        return massAffected;
-    }
-
-    /**
-     * Difference of mass of actually decayed elements
-     * @return
-     */
-    public double getMassDiff() {
-        return massDiff;
-    }
-
-    public void setMassAffected(double massAffected) {
-        this.massAffected = massAffected;
-    }
-
-    public void setMassDiff(double massDiff) {
-        this.massDiff = massDiff;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
deleted file mode 100644
index 457a37f7b9..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-
-/**
- * Created by danie_000 on 25.01.2017.
- */
-public interface iElementalContainer {
-    cElementalInstanceStackMap getContentHandler();
-
-    void purgeOverflow();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
new file mode 100644
index 0000000000..d9297436a0
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
@@ -0,0 +1,58 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.Collections;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+public final class EMConstantStackMap/*IMMUTABLE*/ extends EMStackMap<EMDefinitionStack> {//Target class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public static final EMConstantStackMap EMPTY = new EMConstantStackMap();
+
+    private EMConstantStackMap() {
+        super(Collections.emptyNavigableMap());
+    }
+
+    public EMConstantStackMap(EMDefinitionStack... in) {
+        this(new EMDefinitionStackMap(in).getBackingMap());
+    }
+
+    public EMConstantStackMap(NavigableMap<IEMDefinition, EMDefinitionStack> in) {
+        super(Collections.unmodifiableNavigableMap(in));
+    }
+
+    @Override
+    public Class<EMDefinitionStack> getType() {
+        return EMDefinitionStack.class;
+    }
+
+    //IMMUTABLE DON'T NEED IT
+    @Override
+    public EMConstantStackMap clone() {
+        return this;
+    }
+
+    public EMDefinitionStackMap toMutable() {
+        return new EMDefinitionStackMap(new TreeMap<>(getBackingMap()));
+    }
+
+    public static EMConstantStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+        EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].getDefinition().equals(nbtE__)) {
+                throw new EMException("Something went Wrong");
+            }
+        }
+        return new EMConstantStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
new file mode 100644
index 0000000000..45ce50d5c7
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
@@ -0,0 +1,56 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class EMDefinitionStackMap extends EMStackMap<EMDefinitionStack> implements IEMMapWriteExact<EMDefinitionStack> {//Transient class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public EMDefinitionStackMap() {}
+
+    public EMDefinitionStackMap(EMDefinitionStack... in) {
+        putUnifyAllExact(in);
+    }
+
+    public EMDefinitionStackMap(NavigableMap<IEMDefinition, EMDefinitionStack> in) {
+        super(in);
+    }
+
+    @Override
+    public Class<EMDefinitionStack> getType() {
+        return EMDefinitionStack.class;
+    }
+
+    @Override
+    public EMDefinitionStackMap clone() {
+        return new EMDefinitionStackMap(new TreeMap<>(getBackingMap()));
+    }
+
+    public EMConstantStackMap toImmutable() {
+        return new EMConstantStackMap(new TreeMap<>(getBackingMap()));
+    }
+
+    public EMConstantStackMap toImmutable_optimized_unsafe_LeavesExposedElementalTree() {
+        return new EMConstantStackMap(getBackingMap());
+    }
+
+    public static EMDefinitionStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+        EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].getDefinition().equals(nbtE__)) {
+                throw new EMException("Something went Wrong");
+            }
+        }
+        return new EMDefinitionStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
new file mode 100644
index 0000000000..c15142787f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -0,0 +1,242 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.util.DoubleCount.add;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implements IEMMapWrite<EMInstanceStack> {
+    //Constructors
+    public EMInstanceStackMap() {}
+
+    public EMInstanceStackMap(EMInstanceStack... inSafe) {
+        this(true, inSafe);
+    }
+
+    public EMInstanceStackMap(boolean clone, EMInstanceStack... in) {
+        if (clone) {
+            EMInstanceStack[] stacks =new EMInstanceStack[in.length];
+            for(int i=0;i<stacks.length;i++) {
+                stacks[i] = in[i].clone();
+            }
+            putUnifyAll(stacks);
+        } else {
+            putUnifyAll(in);
+        }
+    }
+
+    private EMInstanceStackMap(NavigableMap<IEMDefinition, EMInstanceStack> inSafe) {
+        this(true, inSafe);
+    }
+
+    private EMInstanceStackMap(boolean clone, NavigableMap<IEMDefinition, EMInstanceStack> in) {
+        super(clone?new TreeMap<>():in);
+        if (clone) {
+            for(EMInstanceStack stack:in.values()) {
+                putUnify(stack.clone());
+            }
+        }
+    }
+
+    @Override
+    public Class<EMInstanceStack> getType() {
+        return EMInstanceStack.class;
+    }
+
+    @Override
+    public EMInstanceStackMap clone() {
+        return new EMInstanceStackMap(getBackingMap());
+    }
+
+    //Remove overflow
+    public double removeOverflow(int stacksCount, double stackCapacity) {
+        double massRemoved = 0;
+
+        if (getBackingMap().size() > stacksCount) {
+            IEMDefinition[] keys = keySetToArray();
+            for (int i = stacksCount; i < keys.length; i++) {
+                massRemoved += getBackingMap().get(keys[i]).getDefinitionStack().getMass();
+                getBackingMap().remove(keys[i]);
+            }
+        }
+
+        for (EMInstanceStack instance : valuesToArray()) {
+            if (instance.getAmount() > stackCapacity) {
+                massRemoved += instance.getDefinition().getMass() * (instance.getAmount() - stackCapacity);
+                instance.setAmount(stackCapacity);
+            }
+        }
+        return massRemoved;
+    }
+
+    //Getters
+    public String[] getElementalInfo() {
+        String[] info = new String[getBackingMap().size()];
+        int i = 0;
+        for (EMInstanceStack instance : getBackingMap().values()) {
+            info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName()+
+                    " "+ EnumChatFormatting.AQUA + instance.getDefinition().getSymbol()+ EnumChatFormatting.RESET+
+                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E", instance.getAmount() / AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
+                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
+                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
+        }
+        return info;
+    }
+
+    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<IEMDefinition, EMInstanceStack> e: getBackingMap().entrySet()){
+            e.getValue().addScanShortSymbols(list,capabilities);
+        }
+        return list;
+    }
+
+    public ArrayList<String> getScanInfo(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<IEMDefinition, EMInstanceStack> e: getBackingMap().entrySet()){
+            e.getValue().addScanResults(list,capabilities);
+        }
+        return list;
+    }
+
+    //Tick Content
+    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
+        return tickContent(lifeTimeMult,postEnergize,1D);
+    }
+
+    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
+        cleanUp();
+        double diff=0;
+        for (EMInstanceStack instance : valuesToArray()) {
+            instance.setAge(instance.getAge() + seconds);
+            EMDecayResult newInstances = instance.decay(lifeTimeMult, instance.getAge(), postEnergize);
+            if (newInstances == null) {
+                instance.nextColor();
+            } else {
+                diff=add(diff,newInstances.getMassDiff());
+                removeAmount(instance);//todo check maybe this should be removeKey
+                putUnifyAll(newInstances.getOutput());
+            }
+        }
+        return diff;
+    }
+
+    //NBT
+    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanShortSymbols(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanInfo(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public static EMInstanceStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+        EMInstanceStack[] instances = new EMInstanceStack[nbt.getInteger("i")];
+        for (int i = 0; i < instances.length; i++) {
+            instances[i] = EMInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (instances[i].getDefinition().equals(nbtE__)) {
+                throw new EMException("Something went Wrong");
+            }
+        }
+        return new EMInstanceStackMap(false, instances);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EMInstanceStackMap) {
+            return compareTo((EMInstanceStackMap) obj) == 0;
+        }
+        if (obj instanceof EMStackMap) {
+            return toDefinitionMapForComparison().compareTo((EMStackMap<?>) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder build=new StringBuilder("Instance Stack Map\n");
+        for(EMInstanceStack stack: getBackingMap().values()){
+            build.append(stack.toString()).append('\n');
+        }
+        return build.toString();
+    }
+
+    public EMInstanceStackMap takeAll(){
+        EMInstanceStackMap newStack =new EMInstanceStackMap(false,new TreeMap<>(this.getBackingMap()));//just in case to uncouple The map
+        this.getBackingMap().clear();
+        return newStack;
+    }
+
+    public EMDefinitionStackMap toDefinitionMapForComparison() {
+        EMDefinitionStack[] list = new EMDefinitionStack[size()];
+        int                 i    = 0;
+        for (Map.Entry<IEMDefinition, EMInstanceStack> entry : entrySet()) {
+            EMInstanceStack value = entry.getValue();
+            list[i++] = new EMDefinitionStack(value.getDefinition(), value.getAmount());
+        }
+        return new EMDefinitionStackMap(list);
+    }
+
+    @Override
+    public EMInstanceStack putUnify(EMInstanceStack stack) {
+        EMInstanceStack target =get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = add(target.getAmount(), stack.getAmount());
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=target.unifyIntoThis(stack);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+
+    @Override
+    public EMInstanceStack putUnifyExact(EMInstanceStack stack) {
+        EMInstanceStack target =get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = target.getAmount()+stack.getAmount();
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=target.unifyIntoThis(stack);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
new file mode 100644
index 0000000000..4c798499b5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
@@ -0,0 +1,50 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+abstract class EMStackMap<T extends IEMStack> implements IEMMapRead<T> {
+    private final NavigableMap<IEMDefinition, T> backingMap;
+
+    protected EMStackMap() {
+        this(new TreeMap<>());
+    }
+
+    protected EMStackMap(NavigableMap<IEMDefinition, T> map) {
+        this.backingMap =map;
+    }
+
+    @Override
+    public NavigableMap<IEMDefinition, T> getBackingMap() {
+        return backingMap;
+    }
+
+    @Override
+    public abstract EMStackMap<T> clone();
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EMInstanceStackMap) {
+            return compareTo(((EMInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
+        }
+        if (obj instanceof EMStackMap) {
+            return compareTo((EMStackMap) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Hash only definitions to compare contents not amounts or data
+        int hash = -(getBackingMap().size() << 4);
+        for (T stack : getBackingMap().values()) {
+            hash += stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
new file mode 100644
index 0000000000..392d06f5cf
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
@@ -0,0 +1,275 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.lang.reflect.Array;
+import java.util.*;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
+import static com.github.technus.tectech.util.DoubleCount.ulpSigned;
+
+public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>>, Cloneable {
+    static boolean isValidAmount(double amount){
+        return amount>=AVOGADRO_CONSTANT_UNCERTAINTY;
+    }
+
+    static boolean isInvalidAmount(double amount){
+        return amount<AVOGADRO_CONSTANT_UNCERTAINTY;
+    }
+
+    NavigableMap<IEMDefinition,T> getBackingMap();
+
+    IEMMapRead<T> clone();
+
+    default Set<Map.Entry<IEMDefinition, T>> entrySet(){
+        return getBackingMap().entrySet();
+    }
+
+    default Set<IEMDefinition> keySet(){
+        return getBackingMap().keySet();
+    }
+
+    default IEMDefinition[] keySetToArray() {
+        return keySetToArray(new IEMDefinition[size()]);
+    }
+
+    default IEMDefinition[] keySetToArray(IEMDefinition[] array) {
+        return keySet().toArray(array);
+    }
+
+    default Collection<T> values(){
+        return getBackingMap().values();
+    }
+
+    @SuppressWarnings("unchecked")
+    default T[] valuesToArray(){
+        return valuesToArray((T[]) Array.newInstance(getType(),size()));
+    }
+
+    default T[] valuesToArray(T[] array){
+        return values().toArray(array);
+    }
+
+    Class<T> getType();
+
+    //Getters
+    default T getFirst(){
+        return getBackingMap().firstEntry().getValue();
+    }
+
+    default T getLast(){
+        return getBackingMap().lastEntry().getValue();
+    }
+
+    default T get(IEMStack stack) {
+        return get(stack.getDefinition());
+    }
+
+    default T get(IEMDefinition def) {
+        return getBackingMap().get(def);
+    }
+
+    default T getNaturallySorted(int pos) {
+        if(pos<0 || pos>=size()){
+            throw new IndexOutOfBoundsException("Index was: "+pos+" size was: "+size());
+        }
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            if(pos==0){
+                return entry.getValue();
+            }
+            pos--;
+        }
+        return null;
+    }
+
+    default T getRandom() {
+        return getNaturallySorted(TecTech.RANDOM.nextInt(size()));
+    }
+
+    default String[] getShortSymbolsInfo() {
+        String[] info = new String[size()];
+        int i = 0;
+        for (T instance : values()) {
+            info[i++] = instance.getDefinition().getShortSymbol();
+        }
+        return info;
+    }
+
+    default String[] getElementalInfo() {
+        String[] info = new String[size() * 3];
+        int i = 0;
+        for (T defStack : values()) {
+            info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getLocalizedName();
+            info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
+            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
+            i += 3;
+        }
+        return info;
+    }
+
+    //NBT
+    default NBTTagCompound getShortSymbolsNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getShortSymbolsInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound getInfoNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getElementalInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setInteger("i", size());
+        int i = 0;
+        for (T stack : values()) {
+            nbt.setTag(Integer.toString(i++), stack.toNBT());
+        }
+        return nbt;
+    }
+
+    @Override
+    default int compareTo(IEMMapRead<? extends IEMStack> o) {//this actually compares rest
+        int sizeDiff = size() - o.size();
+        if (sizeDiff != 0) {
+            return sizeDiff;
+        }
+
+        Iterator<T>                  iterator  = values().iterator();
+        Iterator<? extends IEMStack> iteratorO = o.values().iterator();
+
+        while (iterator.hasNext()) {
+            int result = iterator.next().compareTo(iteratorO.next());
+            if (result != 0) {
+                return result;
+            }
+        }
+        return 0;
+    }
+
+    default double getMass(){
+        double mass=0;
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            mass+=entry.getValue().getMass();
+        }
+        return mass;
+    }
+
+    default long getCharge(){
+        long charge=0;
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            charge+=entry.getValue().getCharge();
+        }
+        return charge;
+    }
+
+    //Tests
+    default boolean containsKey(IEMDefinition def) {
+        return getBackingMap().containsKey(def);
+    }
+
+    default boolean containsKey(IEMStack def) {
+        return containsKey(def.getDefinition());
+    }
+
+    default boolean containsAllKeys(IEMDefinition... definitions) {
+        for (IEMDefinition def : definitions) {
+            if (!containsKey(def)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAllKeys(IEMStack... hasElementalDefinition) {
+        for (IEMStack has : hasElementalDefinition) {
+            if (!containsKey(has)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAmountExact(IEMDefinition def, double amount) {
+        T target = getBackingMap().get(def);
+        return target != null && target.getAmount() >= amount;
+    }
+
+    default boolean containsAmountExact(IEMStack stack) {
+        return containsAmountExact(stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean containsAllAmountsExact(IEMStack... stacks) {
+        for (IEMStack stack : stacks) {
+            if(!containsAmountExact(stack)){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAllAmountsExact(IEMMapRead<? extends IEMStack> container) {
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : container.entrySet()) {
+            if(!containsAmountExact(entry.getValue())){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAmount(IEMDefinition def, double amountToConsume) {
+        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        if(amountRequired==amountToConsume){
+            amountRequired-=ulpSigned(amountRequired);
+        }
+        return containsAmountExact(def,amountRequired);
+    }
+
+    default boolean containsAmount(IEMStack stack) {
+        return containsAmount(stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean containsAllAmounts(IEMStack... stacks) {
+        for (IEMStack stack : stacks) {
+            if(!containsAmount(stack)){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAllAmounts(IEMMapRead<? extends IEMStack> container) {
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : container.entrySet()) {
+            if(!containsAmount(entry.getValue())){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default int size() {
+        return getBackingMap().size();
+    }
+
+    default boolean hasStacks() {
+        return !isEmpty();
+    }
+
+    default boolean isEmpty(){
+        return getBackingMap().isEmpty();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
new file mode 100644
index 0000000000..cc22267474
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
@@ -0,0 +1,112 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+
+import java.util.Map;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_EPSILON;
+import static com.github.technus.tectech.util.DoubleCount.*;
+
+public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
+    IEMMapWrite<T> clone();
+
+    /**
+     * Consumes amount from map
+     * @param def def to consume
+     * @param amountToConsume should be comparable to {@link EMTransformationInfo#AVOGADRO_CONSTANT}
+     * @return consumed successfully
+     */
+    default boolean removeAmount(IEMDefinition def, double amountToConsume){
+        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        if(amountRequired==amountToConsume){
+            amountRequired-=ulpSigned(amountRequired);
+        }
+        return removeAmount(def,amountToConsume,amountRequired);
+    }
+
+    default boolean removeAmount(IEMDefinition def, double amountToConsume, double amountRequired){
+        T current=getBackingMap().get(def);
+        if(current!=null){
+            if(current.getAmount()>=amountRequired){
+                double newAmount=sub(current.getAmount(),amountToConsume);
+                if(IEMMapRead.isValidAmount(current.getAmount())){
+                    current=(T)current.mutateAmount(newAmount);
+                    getBackingMap().put(current.getDefinition(),current);
+                }else {
+                    getBackingMap().remove(current.getDefinition());
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    default boolean removeAmount(IEMStack stack) {
+        return removeAmount(stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean removeAllAmounts(IEMStack... stacks) {
+        boolean test = true;
+        for (IEMStack stack : stacks) {
+            test &= containsAmount(stack);
+        }
+        if (!test) {
+            return test;
+        }
+        for (IEMStack stack : stacks) {
+            removeAmount(stack);
+        }
+        return true;
+    }
+
+    default boolean removeAllAmounts(IEMMapRead<? extends IEMStack> map) {
+        boolean test=true;
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            test &= containsAmount(entry.getValue());
+        }
+        if (!test) {
+            return test;
+        }
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            removeAmount(entry.getValue());
+        }
+        return true;
+    }
+
+    //Put unify
+    /**
+     *
+     * @param stack thing to put
+     * @return new mapping or null if merging actually removed stuff
+     */
+    default T putUnify(T stack) {
+        T target=getBackingMap().get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = add(target.getAmount(), stack.getAmount());
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=(T) target.mutateAmount(newAmount);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+
+    default void putUnifyAll(T... defs) {
+        for (T def : defs) {
+            putUnify(def);
+        }
+    }
+
+    default void putUnifyAll(IEMMapRead<T> inTreeUnsafe) {
+        for (T in : inTreeUnsafe.values()) {
+            putUnify(in);
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
new file mode 100644
index 0000000000..7b8853a2f4
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
@@ -0,0 +1,166 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+
+import java.util.Map;
+
+public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
+    default void cleanUp(){
+        entrySet().removeIf(entry -> IEMMapRead.isInvalidAmount(entry.getValue().getAmount()));
+    }
+
+    default void clear() {
+        getBackingMap().clear();
+    }
+
+    IEMMapWriteExact<T> clone();
+
+    //Remove
+    default T removeKey(IEMDefinition def) {
+        return getBackingMap().remove(def);
+    }
+
+    default T removeKey(IEMStack has) {
+        return removeKey(has.getDefinition());
+    }
+
+    default boolean removeKeys(IEMDefinition... definitions) {
+        boolean hadAll=true;
+        for (IEMDefinition def : definitions) {
+            hadAll&=removeKey(def)!=null;
+        }
+        return hadAll;
+    }
+
+    default boolean removeKeys(IEMStack... hasElementalDefinition) {
+        boolean hadAll=true;
+        for (IEMStack has : hasElementalDefinition) {
+            hadAll&=removeKey(has)!=null;
+        }
+        return hadAll;
+    }
+
+    default boolean removeAllKeys(IEMDefinition... definitions) {
+        boolean hadAll=containsAllKeys(definitions);
+        if(hadAll){
+            for (IEMDefinition def : definitions) {
+                removeKey(def);
+            }
+        }
+        return hadAll;
+    }
+
+    default boolean removeAllKeys(IEMStack... hasElementalDefinition) {
+        boolean hadAll=containsAllKeys(hasElementalDefinition);
+        if(hadAll){
+            for (IEMStack stack : hasElementalDefinition) {
+                removeKey(stack);
+            }
+        }
+        return hadAll;
+    }
+
+    default void putReplace(T defStackUnsafe) {
+        getBackingMap().put(defStackUnsafe.getDefinition(), defStackUnsafe);
+    }
+
+    default void putReplaceAll(T... defStacksUnsafe) {
+        for (T defStack : defStacksUnsafe) {
+            putReplace(defStack);
+        }
+    }
+
+    default void putReplaceAll(IEMMapRead<T> inContainerUnsafe) {
+        getBackingMap().putAll(inContainerUnsafe.getBackingMap());
+    }
+
+    /**
+     * Should only be used when modifying definitions to alter the integer count correctly
+     * @param def
+     * @return
+     */
+    default boolean removeAmountExact(IEMStack def){
+        return removeAmountExact(def.getDefinition(),def.getAmount());
+    }
+
+    /**
+     * Should only be used when modifying definitions to alter the integer count correctly
+     * @param def
+     * @param amountToConsume
+     * @return
+     */
+    default boolean removeAmountExact(IEMDefinition def, double amountToConsume){
+        T current=getBackingMap().get(def);
+        if(current!=null){
+            double newAmount=current.getAmount()-amountToConsume;
+            if(newAmount>=0){
+                if(IEMMapRead.isValidAmount(current.getAmount())){
+                    current=(T)current.mutateAmount(newAmount);
+                    getBackingMap().put(current.getDefinition(),current);
+                } else {
+                    getBackingMap().remove(current.getDefinition());
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    default boolean removeAllAmountsExact(IEMStack... stacks) {
+        boolean test = true;
+        for (IEMStack stack : stacks) {
+            test &= containsAmountExact(stack);
+        }
+        if (!test) {
+            return test;
+        }
+        for (IEMStack stack : stacks) {
+            removeAmountExact(stack);
+        }
+        return true;
+    }
+
+    default boolean removeAllAmountsExact(IEMMapRead<? extends IEMStack> map) {
+        boolean test=true;
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            test &= containsAmountExact(entry.getValue());
+        }
+        if (!test) {
+            return test;
+        }
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            removeAmountExact(entry.getValue());
+        }
+        return true;
+    }
+
+    default T putUnifyExact(T stack) {
+        T target=getBackingMap().get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = target.getAmount()+stack.getAmount();
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=(T) target.mutateAmount(newAmount);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+
+    default void putUnifyAllExact(T... defs) {
+        for (T def : defs) {
+            putUnifyExact(def);
+        }
+    }
+
+    default void putUnifyAllExact(IEMMapRead<T> inTreeUnsafe) {
+        for (T in : inTreeUnsafe.values()) {
+            putUnifyExact(in);
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
deleted file mode 100644
index cde1d55561..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.Collections;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-public final class cElementalConstantStackMap/*IMMUTABLE*/ extends cElementalStackMap<cElementalDefinitionStack> {//Target class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public static final cElementalConstantStackMap EMPTY = new cElementalConstantStackMap();
-
-    private cElementalConstantStackMap() {
-        super(Collections.emptyNavigableMap());
-    }
-
-    public cElementalConstantStackMap(cElementalDefinitionStack... in) {
-        this(new cElementalDefinitionStackMap(in).map);
-    }
-
-    public cElementalConstantStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        super(Collections.unmodifiableNavigableMap(in));
-    }
-
-    @Override
-    public Class<cElementalDefinitionStack> getType() {
-        return cElementalDefinitionStack.class;
-    }
-
-    //IMMUTABLE DON'T NEED IT
-    @Override
-    public cElementalConstantStackMap clone() {
-        return this;
-    }
-
-    public cElementalDefinitionStackMap toMutable() {
-        return new cElementalDefinitionStackMap(new TreeMap<>(map));
-    }
-
-    public static cElementalConstantStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalConstantStackMap(defStacks);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
deleted file mode 100644
index 1273119bb3..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalDefinitionStackMap extends cElementalStackMap<cElementalDefinitionStack> implements iElementalMapRW<cElementalDefinitionStack> {//Transient class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public cElementalDefinitionStackMap() {}
-
-    public cElementalDefinitionStackMap(cElementalDefinitionStack... in) {
-        putUnifyAll(in);
-    }
-
-    public cElementalDefinitionStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        super(in);
-    }
-
-    @Override
-    public Class<cElementalDefinitionStack> getType() {
-        return cElementalDefinitionStack.class;
-    }
-
-    @Override
-    public cElementalDefinitionStackMap clone() {
-        return new cElementalDefinitionStackMap(new TreeMap<>(map));
-    }
-
-    public cElementalConstantStackMap toImmutable() {
-        return new cElementalConstantStackMap(new TreeMap<>(map));
-    }
-
-    public cElementalConstantStackMap toImmutable_optimized_unsafe_LeavesExposedElementalTree() {
-        return new cElementalConstantStackMap(map);
-    }
-
-    public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalDefinitionStackMap(defStacks);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
deleted file mode 100644
index aab1f93990..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalInstanceStackMap extends cElementalStackMap<cElementalInstanceStack> implements iElementalMapRW<cElementalInstanceStack> {
-    //Constructors
-    public cElementalInstanceStackMap() {}
-
-    public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) {
-        this(true, inSafe);
-    }
-
-    public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) {
-        if (clone) {
-            cElementalInstanceStack[] stacks=new cElementalInstanceStack[in.length];
-            for(int i=0;i<stacks.length;i++) {
-                stacks[i] = in[i].clone();
-            }
-            putUnifyAll(stacks);
-        } else {
-            putUnifyAll(in);
-        }
-    }
-
-    private cElementalInstanceStackMap(NavigableMap<iElementalDefinition, cElementalInstanceStack> inSafe) {
-        this(true, inSafe);
-    }
-
-    private cElementalInstanceStackMap(boolean clone, NavigableMap<iElementalDefinition, cElementalInstanceStack> in) {
-        if (clone) {
-            map = new TreeMap<>();
-            for(cElementalInstanceStack stack:in.values()) {
-                putUnify(stack.clone());
-            }
-        } else {
-            map = in;
-        }
-    }
-
-    @Override
-    public Class<cElementalInstanceStack> getType() {
-        return cElementalInstanceStack.class;
-    }
-
-    @Override
-    public cElementalInstanceStackMap clone() {
-        return new cElementalInstanceStackMap(map);
-    }
-
-    //Remove overflow
-    public double removeOverflow(int stacksCount, double stackCapacity) {
-        double massRemoved = 0;
-
-        if (map.size() > stacksCount) {
-            iElementalDefinition[] keys = keySetToArray();
-            for (int i = stacksCount; i < keys.length; i++) {
-                massRemoved += map.get(keys[i]).getDefinitionStack().getMass();
-                map.remove(keys[i]);
-            }
-        }
-
-        for (cElementalInstanceStack instance : valuesToArray()) {
-            if (instance.amount > stackCapacity) {
-                massRemoved += instance.definition.getMass() * (instance.amount - stackCapacity);
-                instance.amount = stackCapacity;
-            }
-        }
-        return massRemoved;
-    }
-
-    //Getters
-    public String[] getElementalInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName()+
-                    " "+ EnumChatFormatting.AQUA + instance.definition.getSymbol()+ EnumChatFormatting.RESET+
-                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E",instance.amount/ AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
-                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
-                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
-        }
-        return info;
-    }
-
-    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanShortSymbols(list,capabilities);
-        }
-        return list;
-    }
-
-    public ArrayList<String> getScanInfo(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanResults(list,capabilities);
-        }
-        return list;
-    }
-
-    //Tick Content
-    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
-        return tickContent(lifeTimeMult,postEnergize,1D);
-    }
-
-    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
-        cleanUp();
-        double diff=0;
-        for (cElementalInstanceStack instance : valuesToArray()) {
-            cElementalDecayResult newInstances = instance.decay(lifeTimeMult, instance.age += seconds, postEnergize);
-            if (newInstances == null) {
-                instance.nextColor();
-            } else {
-                diff=add(diff,newInstances.getMassDiff());
-                removeAmount(false,instance);
-                putUnifyAll(newInstances.getOutput());
-            }
-        }
-        return diff;
-    }
-
-    //NBT
-    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanShortSymbols(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanInfo(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public static cElementalInstanceStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalInstanceStack[] instances = new cElementalInstanceStack[nbt.getInteger("i")];
-        for (int i = 0; i < instances.length; i++) {
-            instances[i] = cElementalInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (instances[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalInstanceStackMap(false, instances);
-    }
-
-    //stackUp
-    public static cElementalInstanceStack[] stackUp(cElementalInstanceStack... in) {
-        cElementalInstanceStackMap inTree = new cElementalInstanceStackMap();
-        inTree.putUnifyAll(in);
-        return inTree.valuesToArray();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo((cElementalInstanceStackMap) obj) == 0;
-        }
-        if (obj instanceof cElementalStackMap) {
-            return toDefinitionMapForComparison().compareTo((cElementalStackMap) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder build=new StringBuilder("Instance Stack Map\n");
-        for(cElementalInstanceStack stack:map.values()){
-            build.append(stack.toString()).append('\n');
-        }
-        return build.toString();
-    }
-
-    public cElementalInstanceStackMap takeAll(){
-        cElementalInstanceStackMap newStack=new cElementalInstanceStackMap(false,new TreeMap<>(this.map));//just in case to uncouple The map
-        this.map.clear();
-        return newStack;
-    }
-
-    public cElementalDefinitionStackMap toDefinitionMapForComparison() {
-        cElementalDefinitionStack[] list = new cElementalDefinitionStack[size()];
-        int                         i    = 0;
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : entrySet()) {
-            cElementalInstanceStack value = entry.getValue();
-            list[i++] = new cElementalDefinitionStack(value.getDefinition(), value.getAmount());
-        }
-        return new cElementalDefinitionStackMap(list);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
deleted file mode 100644
index 2b144df128..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-abstract class cElementalStackMap<T extends iElementalStack> implements iElementalMapR<T> {
-    protected NavigableMap<iElementalDefinition, T> map;
-
-    protected cElementalStackMap() {
-        this(new TreeMap<>());
-    }
-
-    protected cElementalStackMap(NavigableMap<iElementalDefinition, T> map) {
-        this.map = map;
-    }
-
-    @Override
-    public NavigableMap<iElementalDefinition, T> getBackingMap() {
-        return map;
-    }
-
-    @Override
-    public abstract cElementalStackMap<T> clone();
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo(((cElementalInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
-        }
-        if (obj instanceof cElementalStackMap) {
-            return compareTo((cElementalStackMap) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Hash only definitions to compare contents not amounts or data
-        int hash = -(map.size() << 4);
-        for (T stack : map.values()) {
-            hash += stack.getDefinition().hashCode();
-        }
-        return hash;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
deleted file mode 100644
index 0491c43ebc..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.lang.reflect.Array;
-import java.util.*;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-
-public interface iElementalMapR<T extends iElementalStack> extends Comparable<iElementalMapR<? extends iElementalStack>>, Cloneable {
-    NavigableMap<iElementalDefinition,T> getBackingMap();
-
-    iElementalMapR<T> clone();
-
-    default Set<Map.Entry<iElementalDefinition, T>> entrySet(){
-        return getBackingMap().entrySet();
-    }
-
-    default Set<iElementalDefinition> keySet(){
-        return getBackingMap().keySet();
-    }
-
-    default iElementalDefinition[] keySetToArray() {
-        return keySetToArray(new iElementalDefinition[size()]);
-    }
-
-    default iElementalDefinition[] keySetToArray(iElementalDefinition[] array) {
-        return getBackingMap().keySet().toArray(array);
-    }
-
-    default Collection<T> values(){
-        return getBackingMap().values();
-    }
-
-    @SuppressWarnings("unchecked")
-    default T[] valuesToArray(){
-        return valuesToArray((T[]) Array.newInstance(getType(),size()));
-    }
-
-    default T[] valuesToArray(T[] array){
-        return getBackingMap().values().toArray(array);
-    }
-
-    Class<T> getType();
-
-    //Getters
-    default T getFirst(){
-        return getBackingMap().firstEntry().getValue();
-    }
-
-    default T getLast(){
-        return getBackingMap().lastEntry().getValue();
-    }
-
-    default T get(iElementalDefinition def) {
-        return getBackingMap().get(def);
-    }
-
-    default T getNaturallySorted(int pos) {
-        if(pos<0 || pos>=size()){
-            throw new IndexOutOfBoundsException("Index was: "+pos+" size was: "+size());
-        }
-        for (Map.Entry<iElementalDefinition, T> entry : entrySet()) {
-            if(pos==0){
-                return entry.getValue();
-            }
-            pos--;
-        }
-        return null;
-    }
-
-    default T getRandom() {
-        return getNaturallySorted(TecTech.RANDOM.nextInt(size()));
-    }
-
-    default String[] getShortSymbolsInfo() {
-        String[] info = new String[size()];
-        int i = 0;
-        for (T instance : values()) {
-            info[i++] = instance.getDefinition().getShortSymbol();
-        }
-        return info;
-    }
-
-    default String[] getElementalInfo() {
-        String[] info = new String[size() * 3];
-        int i = 0;
-        for (T defStack : values()) {
-            info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getName();
-            info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
-            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
-            i += 3;
-        }
-        return info;
-    }
-
-    //NBT
-    default NBTTagCompound getShortSymbolsNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getShortSymbolsInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    default NBTTagCompound getInfoNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getElementalInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    default NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger("i", size());
-        int i = 0;
-        for (T stack : values()) {
-            nbt.setTag(Integer.toString(i++), stack.toNBT());
-        }
-        return nbt;
-    }
-
-    @Override
-    default int compareTo(iElementalMapR<? extends iElementalStack> o) {//this actually compares rest
-        int sizeDiff = size() - o.size();
-        if (sizeDiff != 0) {
-            return sizeDiff;
-        }
-
-        Iterator<T> iterator = values().iterator();
-        Iterator<? extends iElementalStack> iteratorO = o.values().iterator();
-
-        while (iterator.hasNext()) {
-            int result = iterator.next().compareTo(iteratorO.next());
-            if (result != 0) {
-                return result;
-            }
-        }
-        return 0;
-    }
-
-    default double getMass(){
-        double mass=0;
-        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
-            mass+=entry.getValue().getMass();
-        }
-        return mass;
-    }
-
-    default long getCharge(){
-        long charge=0;
-        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
-            charge+=entry.getValue().getCharge();
-        }
-        return charge;
-    }
-
-    //Tests
-    default boolean containsKey(iElementalDefinition def) {
-        return getBackingMap().containsKey(def);
-    }
-
-    default boolean containsKey(iElementalStack def) {
-        return containsKey(def.getDefinition());
-    }
-
-    default int size() {
-        return getBackingMap().size();
-    }
-
-    default boolean hasStacks() {
-        return !isEmpty();
-    }
-
-    default boolean isEmpty(){
-        return getBackingMap().isEmpty();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
deleted file mode 100644
index 7f8d314858..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import java.util.Map;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
-import static com.github.technus.tectech.util.DoubleCount.sub;
-
-public interface iElementalMapRW<T extends iElementalStack> extends iElementalMapR<T> {
-    iElementalMapRW<T> clone();
-
-    default void cleanUp(){
-        getBackingMap().entrySet().removeIf(entry -> entry.getValue().getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY);
-    }
-
-    default void clear() {
-        getBackingMap().clear();
-    }
-
-    //Remove
-    default T remove(iElementalDefinition def) {
-        return getBackingMap().remove(def);
-    }
-
-    default T remove(iElementalStack has) {
-        return remove(has.getDefinition());
-    }
-
-    default void removeAll(iElementalDefinition... definitions) {
-        for (iElementalDefinition def : definitions) {
-            getBackingMap().remove(def);
-        }
-    }
-
-    default void removeAll(iElementalStack... hasElementalDefinition) {
-        for (iElementalStack has : hasElementalDefinition) {
-            getBackingMap().remove(has.getDefinition());
-        }
-    }
-
-    default boolean removeAmount(boolean testOnly, iElementalStack stack) {
-        return removeAmount(testOnly,stack.getDefinition(),stack.getAmount());
-    }
-
-    default boolean removeAmount(boolean testOnly, iElementalDefinition def,double amount) {
-        T target = getBackingMap().get(def);
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.getAmount() >= amount;
-        } else {
-            double newAmount = sub(target.getAmount(),amount);
-            if (newAmount > 0) {
-                getBackingMap().put(target.getDefinition(), (T)target.mutateAmount(newAmount));
-                return true;
-            } else if (newAmount == 0) {
-                getBackingMap().remove(def);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    default boolean removeAllAmounts(boolean testOnly, iElementalStack... stacks) {
-        boolean test = true;
-        for (iElementalStack stack : stacks) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (iElementalStack stack : stacks) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    default boolean removeAllAmounts(boolean testOnly, iElementalMapR<? extends iElementalStack> container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
-            removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    //Put replace
-    default T putReplace(T defStackUnsafe) {
-        return getBackingMap().put(defStackUnsafe.getDefinition(), defStackUnsafe);
-    }
-
-    default void putReplaceAll(T... defStacks) {
-        for (T defStack : defStacks) {
-            getBackingMap().put(defStack.getDefinition(), defStack);
-        }
-    }
-
-    default void putReplaceAll(iElementalMapR<T> inContainerUnsafe) {
-        getBackingMap().putAll(inContainerUnsafe.getBackingMap());
-    }
-
-    //Put unify
-    default T putUnify(T def) {
-        T stack=getBackingMap().get(def.getDefinition());
-        if(stack==null) {
-            return getBackingMap().put(def.getDefinition(), def);
-        }
-        return getBackingMap().put(def.getDefinition(), (T)stack.mutateAmount(def.getAmount()+stack.getAmount()));
-    }
-
-    default void putUnifyAll(T... defs) {
-        for (T def : defs) {
-            putUnify(def);
-        }
-    }
-
-    default void putUnifyAll(iElementalMapR<T> inTreeUnsafe) {
-        for (T in : inTreeUnsafe.values()) {
-            putUnify(in);
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java
new file mode 100644
index 0000000000..4b0792eac9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java
@@ -0,0 +1,87 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class EMRecipe<T> implements Comparable<EMRecipe<T>> {
+    private final int                         ID;
+    private final EMConstantStackMap             inEM;
+    private final IEMMapRead<? extends IEMStack> outEM;
+    private final ItemStack[]                    outItems;
+    private final FluidStack[] outFluids;
+    private       T     extension;
+
+    public EMRecipe(
+            EMConstantStackMap inEM,//not null plz
+            int id,
+            IEMMapRead<? extends IEMStack> outEM,
+            ItemStack[] outItems,
+            FluidStack[] outFluids) {
+        this.inEM = inEM;
+        this.outEM = outEM;
+        this.outItems = outItems;
+        this.outFluids = outFluids;
+        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
+    }
+
+    public EMRecipe<T> extend(T data) {
+        setExtension(data);
+        return this;
+    }
+
+    @Override
+    public int compareTo(EMRecipe<T> o) {
+        int compare = getInEM().compareTo(o.getInEM());
+        if(compare!=0) {
+            return compare;
+        }
+        return Integer.compare(getID(), o.getID());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EMRecipe) {
+            return compareTo((EMRecipe) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return getInEM().hashCode();
+    }
+
+    public int getID() {
+        return ID;
+    }
+
+    public EMConstantStackMap getInEM() {
+        return inEM;
+    }
+
+    public IEMMapRead<? extends IEMStack> getOutEM() {
+        return outEM;
+    }
+
+    public ItemStack[] getOutItems() {
+        return outItems;
+    }
+
+    public FluidStack[] getOutFluids() {
+        return outFluids;
+    }
+
+    public T getExtension() {
+        return extension;
+    }
+
+    public void setExtension(T extension) {
+        this.extension = extension;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java
new file mode 100644
index 0000000000..811a9bc370
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java
@@ -0,0 +1,65 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.*;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class EMRecipeMap<T> {//TODO FIX
+    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
+    private final Map<EMConstantStackMap, Map<Integer, EMRecipe<T>>> recipes;
+
+    public EMRecipeMap() {
+        recipes = new HashMap<>();
+    }
+
+    public EMRecipe<T> put(EMRecipe<T> in) {
+        Map<Integer, EMRecipe<T>> r = getRecipes().computeIfAbsent(in.getInEM(), k -> new HashMap<>());
+        return r.put(in.getID(), in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
+        //It is either bad, or unimportant if you use different id's
+    }
+
+    public void putAll(EMRecipe<T>... contents) {
+        for (EMRecipe<T> recipe : contents) {
+            put(recipe);
+        }
+    }
+
+    public EMRecipe<T> remove(IEMMapRead<EMDefinitionStack> map, int id) {
+        Map<Integer, EMRecipe<T>> recipesMap = getRecipes().get(map);
+        return recipesMap != null ? recipesMap.remove(id) : null;//todo check, suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    public Map<Integer, EMRecipe<T>> remove(IEMMapRead<EMDefinitionStack> map) {
+        return getRecipes().remove(map);//todo check, suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
+    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
+    @Deprecated
+    public Map<Integer, EMRecipe<T>> findExact(IEMMapRead<? extends IEMStack> in) {
+        return getRecipes().get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //this does check if the map contains all the requirements for any recipe, and the required amounts
+    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
+    public Map<Integer, EMRecipe<T>> findMatch(IEMMapRead<? extends IEMStack> in) {
+        for (Map.Entry<EMConstantStackMap, Map<Integer, EMRecipe<T>>> cElementalDefinitionStackMapHashMapEntry : getRecipes().entrySet()) {
+            if (in.containsAllAmounts(cElementalDefinitionStackMapHashMapEntry.getKey())) {
+                return cElementalDefinitionStackMapHashMapEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    public Map<EMConstantStackMap, Map<Integer, EMRecipe<T>>> getRecipes() {
+        return recipes;
+    }
+
+    //To check for instance data and other things use recipe extensions!
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
deleted file mode 100644
index 8c0fb40a4b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipe implements Comparable<rElementalRecipe> {
-    public final short                      ID;
-    public final cElementalConstantStackMap inEM;
-    public final cElementalConstantStackMap outEM;
-    public final ItemStack[]                outItems;
-    public final FluidStack[] outFluids;
-    public Object[] extension;
-
-    public rElementalRecipe(
-            cElementalConstantStackMap inEM,//not null plz
-            short id,
-            cElementalConstantStackMap outEM,
-            ItemStack[] outItems,
-            FluidStack[] outFluids) {
-        this.inEM = inEM;
-        this.outEM = outEM;
-        this.outItems = outItems;
-        this.outFluids = outFluids;
-        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
-    }
-
-    public rElementalRecipe extend(Object... data) {
-        extension = data;
-        return this;
-    }
-
-    @Override
-    public int compareTo(rElementalRecipe o) {
-        int compare = inEM.compareTo(o.inEM);
-        if(compare!=0) {
-            return compare;
-        }
-        return Short.compare(ID, o.ID);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof rElementalRecipe) {
-            return compareTo((rElementalRecipe) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return inEM.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
deleted file mode 100644
index 56a9030354..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.*;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipeMap {//TODO FIX
-    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
-    private final HashMap<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> recipes;
-
-    public rElementalRecipeMap() {
-        recipes = new HashMap<>();
-    }
-
-    public rElementalRecipe put(rElementalRecipe in) {
-        HashMap<Short, rElementalRecipe> r = recipes.computeIfAbsent(in.inEM, k -> new HashMap<>());
-        return r.put(in.ID, in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
-        //It is either bad, or unimportant if you use different id's
-    }
-
-    public void putAll(rElementalRecipe... contents) {
-        for (rElementalRecipe recipe : contents) {
-            put(recipe);
-        }
-    }
-
-    public rElementalRecipe remove(iElementalMapR<cElementalDefinitionStack> map, short id) {
-        return recipes.get(map).remove(id);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> remove(iElementalMapR<cElementalDefinitionStack> map) {
-        return recipes.remove(map);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> findExact(cElementalInstanceStackMap in) {
-        return recipes.get(in.toDefinitionMapForComparison());//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
-    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findExact(iElementalMapR<cElementalDefinitionStack> in) {
-        return recipes.get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //this does check if the map contains all the requirements for any recipe, and the required amounts
-    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalDefinitionStackMap in, boolean testOnlyTruePreferred) {
-        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnlyTruePreferred, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalInstanceStackMap in, boolean testOnly) {
-        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnly, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    //To check for instance data and other things use recipe extensions!
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
new file mode 100644
index 0000000000..fe0c73e795
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
@@ -0,0 +1,73 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+
+/**
+ * Created by danie_000 on 20.11.2016.
+ */
+public final class EMDefinitionStack implements IEMStack {
+    private final IEMDefinition definition;
+    private final double        amount;
+
+    public EMDefinitionStack(IEMDefinition def, double amount) {
+        definition = def == null ? null__ : def;
+        this.amount = amount;
+    }
+
+    @Override
+    public EMDefinitionStack clone() {
+        return this;//IMMUTABLE
+    }
+
+    @Override
+    public EMDefinitionStack mutateAmount(double newAmount) {
+        if(getAmount() == newAmount){
+            return this;
+        }
+        return new EMDefinitionStack(getDefinition(), newAmount);//IMMUTABLE
+    }
+
+    @Override
+    public IEMDefinition getDefinition() {
+        return definition;//IMMUTABLE
+    }
+
+    @Override
+    public double getAmount() {
+        return amount;
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setDouble("Q", getAmount());
+        return nbt;
+    }
+
+    public static EMDefinitionStack fromNBT(NBTTagCompound nbt) {
+        return new EMDefinitionStack(
+                EMComplex.fromNBT(nbt.getCompoundTag("d")),
+                nbt.getLong("q")+nbt.getDouble("Q"));
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof IEMDefinition) {
+            return getDefinition().compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return getDefinition().compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    //Amount shouldn't be hashed if this is just indicating amount and not structure
+    @Override
+    public int hashCode() {
+        return getDefinition().hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
new file mode 100644
index 0000000000..b73bd21f02
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
@@ -0,0 +1,605 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.util.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static com.github.technus.tectech.util.DoubleCount.*;
+import static java.lang.Math.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMInstanceStack implements IEMStack {
+    public static int MIN_MULTIPLE_DECAY_CALLS = 4, MAX_MULTIPLE_DECAY_CALLS = 16;
+    public static double DECAY_CALL_PER = AVOGADRO_CONSTANT;//todo
+
+    private final IEMDefinition definition;
+    private       double        amount;
+
+    private double age;
+    //energy - if positive then particle should try to decay
+    private long   energy;
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
+    private byte   color;
+    private double lifeTime;
+    private double lifeTimeMult;
+
+    public EMInstanceStack(IEMStack stackSafe) {
+        this(stackSafe.getDefinition(), stackSafe.getAmount(), 1D, 0D, 0);
+    }
+
+    public EMInstanceStack(IEMStack stackSafe, double lifeTimeMult, double age, long energy) {
+        this(stackSafe.getDefinition(), stackSafe.getAmount(), lifeTimeMult, age, energy);
+    }
+
+    public EMInstanceStack(IEMDefinition defSafe, double amount) {
+        this(defSafe, amount, 1D, 0D, 0);
+    }
+
+    public EMInstanceStack(IEMDefinition defSafe, double amount, double lifeTimeMult, double age, long energy) {
+        definition = defSafe == null ? null__ : defSafe;
+        byte bColor = getDefinition().getColor();
+        if (bColor < 0 || bColor > 2) {//transforms colorable??? into proper color
+            this.color = bColor;
+        } else {
+            this.color = (byte) TecTech.RANDOM.nextInt(3);
+        }
+        this.lifeTimeMult = lifeTimeMult;
+        lifeTime = getDefinition().getRawTimeSpan(energy) * this.lifeTimeMult;
+        setEnergy(energy);
+        this.setAge(age);
+        this.setAmount(amount);
+    }
+
+    //Clone proxy
+    private EMInstanceStack(EMInstanceStack stack) {
+        definition = stack.getDefinition();
+        color = stack.color;
+        setAge(stack.getAge());
+        setAmount(stack.getAmount());
+        lifeTime = stack.lifeTime;
+        lifeTimeMult = stack.lifeTimeMult;
+        energy = stack.energy;
+    }
+
+    @Override
+    public EMInstanceStack clone() {
+        return new EMInstanceStack(this);
+    }
+
+    @Override
+    public EMInstanceStack mutateAmount(double newAmount) {
+        this.setAmount(newAmount);
+        return this;
+    }
+
+    @Override
+    public double getAmount() {
+        return amount;
+    }
+
+    public long getEnergy() {
+        return energy;
+    }
+
+    public void setEnergy(long newEnergyLevel) {
+        energy = newEnergyLevel;
+        setLifeTimeMultiplier(getLifeTimeMultiplier());
+    }
+
+    public double getEnergySettingCost(long currentEnergyLevel, long newEnergyLevel) {
+        return getDefinition().getEnergyDiffBetweenStates(currentEnergyLevel, newEnergyLevel) * getAmount();
+    }
+
+    public double getEnergySettingCost(long newEnergyLevel) {
+        return getEnergySettingCost(energy, newEnergyLevel) * getAmount();
+    }
+
+    public EMDefinitionStack getDefinitionStack() {
+        return new EMDefinitionStack(getDefinition(), getAmount());
+    }
+
+    @Override
+    public IEMDefinition getDefinition() {
+        return definition;
+    }
+
+    public byte getColor() {
+        return color;
+    }
+
+    public void setColor(byte color) {//does not allow changing magic element
+        if (this.color < 0 || this.color > 2 || color < 0 || color >= 3) {
+            return;
+        }
+        this.color = color;
+    }
+
+    public void nextColor() {//does not allow changing magic element
+        if (color < 0 || color > 2) {
+            return;
+        }
+        color = (byte) TecTech.RANDOM.nextInt(3);
+    }
+
+    public double getLifeTime() {
+        return lifeTime;
+    }
+
+    public void setLifeTimeMultiplier(double mult) {
+        if (mult <= 0) //since infinity*0=nan
+        {
+            throw new IllegalArgumentException("multiplier must be >0");
+        }
+        lifeTimeMult = mult;
+        if (getDefinition().getRawTimeSpan(energy) <= 0) {
+            return;
+        }
+        lifeTime = getDefinition().getRawTimeSpan(energy) * lifeTimeMult;
+    }
+
+    public double getLifeTimeMultiplier() {
+        return lifeTimeMult;
+    }
+
+    public EMDecayResult tickStackByOneSecond(double lifeTimeMult, int postEnergize) {
+        return tickStack(lifeTimeMult, postEnergize, 1D);
+    }
+
+    public EMDecayResult tickStack(double lifeTimeMult, int postEnergize, double seconds) {
+        setAge(getAge() + seconds);
+        EMDecayResult newInstances = decay(lifeTimeMult, getAge(), postEnergize);
+        if (newInstances == null) {
+            nextColor();
+        } else {
+            for (EMInstanceStack newInstance : newInstances.getOutput().valuesToArray()) {
+                newInstance.nextColor();
+            }
+        }
+        return newInstances;
+    }
+
+    public EMDecayResult decay() {
+        return decay(1D, getAge(), 0);//try to decay without changes
+    }
+
+    public EMDecayResult decay(double apparentAge, long postEnergize) {
+        return decay(1D, apparentAge, postEnergize);
+    }
+
+    public EMDecayResult decay(double lifeTimeMult, double apparentAge, long postEnergize) {
+        long newEnergyLevel = postEnergize + energy;
+        if (newEnergyLevel > 0) {
+            newEnergyLevel -= 1;
+        } else if (newEnergyLevel < 0) {
+            newEnergyLevel += 1;
+        }
+        EMDecayResult output;
+        if (getDefinition().usesMultipleDecayCalls(energy)) {
+            double amountTemp = getAmount();
+            int    decayCnt   = (int) min(MAX_MULTIPLE_DECAY_CALLS, max(getAmount() / DECAY_CALL_PER, MIN_MULTIPLE_DECAY_CALLS));
+            setAmount(div(getAmount(), decayCnt));
+            decayCnt--;
+
+            output = decayMechanics(lifeTimeMult, apparentAge, newEnergyLevel);
+            if (output == null) {
+                setAmount(amountTemp);
+                return null;
+            }
+
+            for (int i = 0; i < decayCnt; i++) {
+                EMDecayResult map = decayMechanics(lifeTimeMult, apparentAge, newEnergyLevel);
+                if (map != null) {
+                    output.getOutput().putUnifyAll(map.getOutput());
+                    output.setMassDiff(add(output.getMassDiff(), map.getMassDiff()));
+                    output.setMassAffected(output.getMassDiff() + map.getMassDiff());
+                }
+            }
+            setAmount(amountTemp);
+        } else {
+            output = decayMechanics(lifeTimeMult, apparentAge, newEnergyLevel);
+        }
+        if (output != null) {
+            output.getOutput().cleanUp();
+        }
+        return output;
+    }
+
+    private EMDecayResult decayMechanics(double lifeTimeMult, double apparentAge, long newEnergyLevel) {
+        if (energy > 0 && !getDefinition().usesSpecialEnergeticDecayHandling()) {
+            setLifeTimeMultiplier(getLifeTimeMultiplier());
+            return decayCompute(getDefinition().getEnergyInducedDecay(energy), lifeTimeMult, -1D, newEnergyLevel);
+        } else if (getDefinition().getRawTimeSpan(energy) < 0) {
+            return null;//return null, decay cannot be achieved
+        } else if (getDefinition().isTimeSpanHalfLife()) {
+            return exponentialDecayCompute(energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getDecayArray(), lifeTimeMult, -1D, newEnergyLevel);
+        } else {
+            if (1 > lifeTime) {
+                return decayCompute(energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getNaturalDecayInstant(), lifeTimeMult, 0D, newEnergyLevel);
+            } else if (apparentAge > lifeTime) {
+                return decayCompute(energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getDecayArray(), lifeTimeMult, 0D, newEnergyLevel);
+            }
+        }
+        return null;//return null since decay cannot be achieved
+    }
+
+    //Use to get direct decay output providing correct decay array
+    private EMDecayResult exponentialDecayCompute(EMDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
+        double newAmount = div(getAmount(), Math.pow(2D, 1D/* 1 second */ / lifeTime));
+
+        //if(definition.getSymbol().startsWith("U ")) {
+        //    System.out.println("newAmount = " + newAmount);
+        //    System.out.println("amountRemaining = " + amountRemaining);
+        //    for(cElementalDecay decay:decays){
+        //        System.out.println("prob = "+decay.probability);
+        //        for(cElementalDefinitionStack stack:decay.outputStacks.values()){
+        //            System.out.println("stack = " + stack.getDefinition().getSymbol() + " " + stack.amount);
+        //        }
+        //    }
+        //}
+        if (newAmount == getAmount()) {
+            newAmount -= ulpSigned(newAmount);
+        } else if (newAmount < 1) {
+            return decayCompute(decays, lifeTimeMult, newProductsAge, newEnergyLevel);
+        }
+
+        //split to non decaying and decaying part
+        double amount = this.getAmount();
+        this.setAmount(this.getAmount() - newAmount);
+        EMDecayResult products = decayCompute(decays, lifeTimeMult, newProductsAge, newEnergyLevel);
+        this.setAmount(newAmount);
+        if (products != null) {
+            products.getOutput().putUnify(clone());
+        }
+        this.setAmount(amount);
+        return products;
+    }
+
+    //Use to get direct decay output providing correct decay array
+    private EMDecayResult decayCompute(EMDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
+        if (decays == null) {
+            return null;//Can not decay so it won't
+        }
+        boolean makesEnergy = getDefinition().decayMakesEnergy(energy);
+        double  mass        = getMass();
+        if (decays.length == 0) {
+            return makesEnergy ? null : new EMDecayResult(new EMInstanceStackMap(), mass, 0);
+            //provide non null 0 length array for annihilation
+        } else if (decays.length == 1) {//only one type of decay :D, doesn't need dead end
+            if (decays[0] == deadEnd) {
+                return makesEnergy ? null : new EMDecayResult(decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, getAmount()), mass, 0);
+            }
+            EMInstanceStackMap output = decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, getAmount());
+            if (newProductsAge < 0) {
+                if (output.size() == 1) {
+                    if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                        output.getFirst().setEnergy(energy);
+                        output.getFirst().setAge(getAge());
+                    }
+                } else {
+                    for (EMInstanceStack stack : output.valuesToArray()) {
+                        if (stack.getDefinition().equals(getDefinition())) {
+                            stack.setAge(getAge());
+                        }
+                    }
+                }
+            } else {
+                if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                    output.getFirst().setEnergy(energy);
+                }
+            }
+            if (energy <= 0 && output.getMass() > mass) {
+                return null;//no energy usage to decay
+            }
+            return new EMDecayResult(new EMInstanceStackMap(), mass, makesEnergy ? output.getMass() - mass : 0);
+        } else {
+            EMDecayResult      totalOutput     = new EMDecayResult(new EMInstanceStackMap(), getMass(), 0);
+            EMInstanceStackMap output          = totalOutput.getOutput(), results;
+            int                differentDecays = decays.length;
+            double[]           probabilities   = new double[differentDecays];
+            for (int i = 0; i < probabilities.length; i++) {
+                probabilities[i] = decays[i].getProbability();
+            }
+            double[] qttyOfDecay;
+            try {
+                qttyOfDecay = distribute(getAmount(), probabilities);
+            } catch (ArithmeticException e) {
+                Minecraft.getMinecraft().crashed(new CrashReport("Decay failed for: " + this, e));
+                return null;
+            }
+            //long amountRemaining = this.amount, amount = this.amount;
+            //float remainingProbability = 1D;
+//
+            //for (int i = 0; i < differentDecays; i++) {
+            //    if (decays[i].probability >= 1D) {
+            //        long thisDecayAmount = (long) Math.floor(remainingProbability * (double) amount);
+            //        if (thisDecayAmount > 0) {
+            //            if (thisDecayAmount <= amountRemaining) {
+            //                amountRemaining -= thisDecayAmount;
+            //                qttyOfDecay[i] += thisDecayAmount;
+            //            }else {//in case too much was made
+            //                qttyOfDecay[i] += amountRemaining;
+            //                amountRemaining = 0;
+            //                //remainingProbability=0;
+            //            }
+            //        }
+            //        break;
+            //    }
+            //    long thisDecayAmount = (long) Math.floor(decays[i].probability * (double) amount);
+            //    if (thisDecayAmount <= amountRemaining && thisDecayAmount > 0) {//some was made
+            //        amountRemaining -= thisDecayAmount;
+            //        qttyOfDecay[i] += thisDecayAmount;
+            //    } else if (thisDecayAmount > amountRemaining) {//too much was made
+            //        qttyOfDecay[i] += amountRemaining;
+            //        amountRemaining = 0;
+            //        //remainingProbability=0;
+            //        break;
+            //    }
+            //    remainingProbability -= decays[i].probability;
+            //    if(remainingProbability<=0) {
+            //        break;
+            //    }
+            //}
+
+            //for (int i = 0; i < amountRemaining; i++) {
+            //    double rand = TecTech.RANDOM.nextDouble();
+            //    for (int j = 0; j < differentDecays; j++) {//looking for the thing it decayed into
+            //        rand -= decays[j].probability;
+            //        if (rand <= 0D) {
+            //            qttyOfDecay[j]++;
+            //            break;
+            //        }
+            //    }
+            //}
+
+            if (getDefinition().decayMakesEnergy(energy)) {
+                for (int i = differentDecays - 1; i >= 0; i--) {
+                    if (decays[i] == deadEnd) {
+                        EMInstanceStack clone = clone();
+                        clone.setAmount(qttyOfDecay[i]);
+                        output.putUnify(clone);
+                    } else {
+                        results = decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
+                        output.putUnifyAll(results);
+                        totalOutput.setMassDiff(add(totalOutput.getMassDiff(), results.getMass() - mass));
+                    }
+                }
+            } else {
+                for (int i = differentDecays - 1; i >= 0; i--) {
+                    results = decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
+                    output.putUnifyAll(results);
+                }
+            }
+
+            if (newProductsAge < 0) {
+                if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().setAge(getAge());
+                } else {
+                    for (EMInstanceStack stack : output.valuesToArray()) {
+                        if (stack.getDefinition().equals(getDefinition())) {
+                            stack.setAge(getAge());
+                        }
+                    }
+                }
+            } else {
+                if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().setAge(getAge());
+                }
+            }
+            if (energy <= 0 && output.getMass() > getMass()) {
+                return null;//no energy usage to decay
+            }
+            return totalOutput;
+        }
+    }
+
+    public EMInstanceStack unifyIntoThis(EMInstanceStack... instances) {
+        if (instances == null) {
+            return this;
+        }
+        //returns with the definition from the first object passed
+        double energyTotal = getEnergySettingCost(0, energy);
+        long   maxEnergy   = energy;
+        long   minEnergy   = energy;
+
+        for (EMInstanceStack instance : instances) {
+            //if (instance != null && compareTo(instance) == 0) {
+            setAmount(add(getAmount(), instance.getAmount()));
+            energyTotal += instance.getEnergySettingCost(0, instance.energy);
+            maxEnergy = max(instance.energy, maxEnergy);
+            minEnergy = min(instance.energy, maxEnergy);
+            lifeTimeMult = min(lifeTimeMult, instance.lifeTimeMult);
+            setAge(max(getAge(), instance.getAge()));
+            //}
+        }
+
+        if (energyTotal >= 0) {
+            for (; maxEnergy > 0; maxEnergy--) {
+                if (getEnergySettingCost(0, maxEnergy) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(maxEnergy);
+        } else {
+            for (; minEnergy < 0; minEnergy++) {
+                if (getEnergySettingCost(minEnergy, 0) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(minEnergy);
+        }
+        return this;
+    }
+
+    public EMInstanceStack unifyIntoThisExact(EMInstanceStack... instances) {
+        if (instances == null) {
+            return this;
+        }
+        //returns with the definition from the first object passed
+        double energyTotal = getEnergySettingCost(0, energy);
+        long   maxEnergy   = energy;
+        long   minEnergy   = energy;
+
+        for (EMInstanceStack instance : instances) {
+            //if (instance != null && compareTo(instance) == 0) {
+            setAmount(getAmount() + instance.getAmount());
+            energyTotal += instance.getEnergySettingCost(0, instance.energy);
+            maxEnergy = max(instance.energy, maxEnergy);
+            minEnergy = min(instance.energy, maxEnergy);
+            lifeTimeMult = min(lifeTimeMult, instance.lifeTimeMult);
+            setAge(max(getAge(), instance.getAge()));
+            //}
+        }
+
+        if (energyTotal >= 0) {
+            for (; maxEnergy > 0; maxEnergy--) {
+                if (getEnergySettingCost(0, maxEnergy) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(maxEnergy);
+        } else {
+            for (; minEnergy < 0; minEnergy++) {
+                if (getEnergySettingCost(minEnergy, 0) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(minEnergy);
+        }
+        return this;
+    }
+
+    public void addScanShortSymbols(ArrayList<String> lines, int[] detailsOnDepthLevels) {
+        int capabilities = detailsOnDepthLevels[0];
+        getDefinition().addScanShortSymbols(lines, capabilities, energy);
+        //scanShortSymbolsContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
+    }
+
+    //private void scanShortSymbolsContents(ArrayList<String> lines, cElementalDefinitionStackMap definitions, int depth, int[] detailsOnDepthLevels){
+    //    if(definitions!=null && depth<detailsOnDepthLevels.length){
+    //        int deeper=depth+1;
+    //        for(cElementalDefinitionStack definitionStack:definitions.values()) {
+    //            definition.addScanShortSymbols(lines,detailsOnDepthLevels[depth],energy);
+    //            scanSymbolsContents(lines,definitionStack.definition.getSubParticles(),deeper,detailsOnDepthLevels);
+    //        }
+    //    }
+    //}
+
+    public void addScanResults(ArrayList<String> lines, int[] detailsOnDepthLevels) {
+        int capabilities = detailsOnDepthLevels[0];
+        if (Util.areBitsSet(SCAN_GET_DEPTH_LEVEL, capabilities)) {
+            lines.add("DEPTH = " + 0);
+        }
+        getDefinition().addScanResults(lines, capabilities, energy);
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_MULT, capabilities)) {
+            lines.add("TIME MULT = " + lifeTimeMult);
+            if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+                lines.add("TIME SPAN = " + lifeTime + " s");
+            }
+        }
+        if (Util.areBitsSet(SCAN_GET_AGE, capabilities)) {
+            lines.add("AGE = " + getAge() + " s");
+        }
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add("COLOR = " + color + " RGB or CMY");
+        }
+        if (Util.areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) {
+            lines.add("ENERGY = " + energy);
+        }
+        if (Util.areBitsSet(SCAN_GET_AMOUNT, capabilities)) {
+            lines.add("AMOUNT = " + getAmount() / AVOGADRO_CONSTANT + " mol");
+        }
+        scanContents(lines, getDefinition().getSubParticles(), 1, detailsOnDepthLevels);
+    }
+
+    private void scanContents(ArrayList<String> lines, EMConstantStackMap definitions, int depth, int[] detailsOnDepthLevels) {
+        if (definitions != null && depth < detailsOnDepthLevels.length) {
+            int deeper = depth + 1;
+            for (EMDefinitionStack definitionStack : definitions.valuesToArray()) {
+                lines.add("");//def separator
+                if (Util.areBitsSet(SCAN_GET_DEPTH_LEVEL, detailsOnDepthLevels[depth])) {
+                    lines.add("DEPTH = " + depth);
+                }
+                getDefinition().addScanResults(lines, detailsOnDepthLevels[depth], energy);
+                if (Util.areBitsSet(SCAN_GET_AMOUNT, detailsOnDepthLevels[depth])) {
+                    lines.add("AMOUNT = " + definitionStack.getAmount());
+                }
+                scanContents(lines, definitionStack.getDefinition().getSubParticles(), deeper, detailsOnDepthLevels);
+            }
+        }
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setDouble("Q", getAmount());
+        nbt.setLong("e", energy);
+        nbt.setByte("c", color);
+        nbt.setDouble("A", getAge());
+        nbt.setDouble("M", lifeTimeMult);
+        return nbt;
+    }
+
+    public static EMInstanceStack fromNBT(NBTTagCompound nbt) {
+        NBTTagCompound definition = nbt.getCompoundTag("d");
+        EMInstanceStack instance = new EMInstanceStack(
+                EMComplex.fromNBT(definition),
+                nbt.getLong("q") + nbt.getDouble("Q"),
+                nbt.getFloat("m") + nbt.getDouble("M"),
+                nbt.getLong("a") + nbt.getDouble("A"),
+                nbt.getLong("e"));
+        instance.setColor(nbt.getByte("c"));
+        return instance;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof IEMDefinition) {
+            return getDefinition().compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return getDefinition().compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    //Amount shouldn't be hashed if this is just indicating amount and not structure, DOES NOT CARE ABOUT creativeTabTecTech INFO
+    @Override
+    public int hashCode() {
+        return getDefinition().hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return getDefinition().toString() + '\n' + getAmount() / AVOGADRO_CONSTANT + " mol\n" + getMass();
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    public double getAge() {
+        return age;
+    }
+
+    public void setAge(double age) {
+        this.age = age;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
new file mode 100644
index 0000000000..94c76634d9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
@@ -0,0 +1,37 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Created by danie_000 on 30.01.2017.
+ */
+public interface IEMStack extends Comparable<IEMStack>,Cloneable {
+    IEMDefinition getDefinition();
+
+    double getAmount();
+
+    default double getCharge(){
+        return getDefinition().getCharge()*getAmount();
+    }
+
+    default double getMass(){
+        return getDefinition().getMass()*getAmount();
+    }
+
+    IEMStack clone();
+
+    /**
+     * Will return stack with mutated amount, it might be a new object!
+     * @param newAmount new amount
+     * @return new stack (or previous one if was mutable)
+     */
+    IEMStack mutateAmount(double newAmount);
+
+    NBTTagCompound toNBT();
+
+    @Override
+    default int compareTo(IEMStack o){
+        return getDefinition().compareTo(o.getDefinition());
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
deleted file mode 100644
index 1e03c8130f..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-
-/**
- * Created by danie_000 on 20.11.2016.
- */
-public final class cElementalDefinitionStack implements iElementalStack {
-    public final iElementalDefinition definition;
-    public final double amount;
-
-    public cElementalDefinitionStack(iElementalDefinition def, double amount) {
-        definition = def == null ? null__ : def;
-        this.amount = amount;
-    }
-
-    @Override
-    public cElementalDefinitionStack clone() {
-        return this;//IMMUTABLE
-    }
-
-    @Override
-    public cElementalDefinitionStack mutateAmount(double amount) {
-        if(this.amount==amount){
-            return this;
-        }
-        return new cElementalDefinitionStack(definition,amount);//IMMUTABLE
-    }
-
-    @Override
-    public iElementalDefinition getDefinition() {
-        return definition;//IMMUTABLE
-    }
-
-    @Override
-    public double getAmount() {
-        return amount;
-    }
-
-    @Override
-    public double getCharge() {
-        return definition.getCharge() * amount;
-    }
-
-    @Override
-    public double getMass() {
-        return definition.getMass() * amount;
-    }
-
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", definition.toNBT());
-        nbt.setDouble("Q", amount);
-        return nbt;
-    }
-
-    public static cElementalDefinitionStack fromNBT(NBTTagCompound nbt) {
-        return new cElementalDefinitionStack(
-                cElementalDefinition.fromNBT(nbt.getCompoundTag("d")),
-                nbt.getLong("q")+nbt.getDouble("Q"));
-    }
-
-    @Override
-    public int compareTo(iElementalStack o) {
-        return definition.compareTo(o.getDefinition());
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof iElementalDefinition) {
-            return definition.compareTo((iElementalDefinition) obj) == 0;
-        }
-        if (obj instanceof iElementalStack) {
-            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    //Amount shouldn't be hashed if this is just indicating amount and not structure
-    @Override
-    public int hashCode() {
-        return definition.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
deleted file mode 100644
index 1c06e560db..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
+++ /dev/null
@@ -1,566 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.util.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.deadEnd;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static com.github.technus.tectech.util.DoubleCount.*;
-import static java.lang.Math.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cElementalInstanceStack implements iElementalStack {
-    public static int MIN_MULTIPLE_DECAY_CALLS=4,MAX_MULTIPLE_DECAY_CALLS=16;
-    public static double DECAY_CALL_PER=AVOGADRO_CONSTANT;//todo
-
-    public final iElementalDefinition definition;
-    //energy - if positive then particle should try to decay
-    private long energy;
-    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private byte color;
-    public double age;
-    public double amount;
-    private double lifeTime;
-    private double lifeTimeMult;
-
-    public cElementalInstanceStack(cElementalDefinitionStack stackSafe) {
-        this(stackSafe.definition, stackSafe.amount, 1D, 0D, 0);
-    }
-
-    public cElementalInstanceStack(cElementalDefinitionStack stackSafe, double lifeTimeMult, double age, long energy) {
-        this(stackSafe.definition, stackSafe.amount, lifeTimeMult, age, energy);
-    }
-
-    public cElementalInstanceStack(iElementalDefinition defSafe, double amount) {
-        this(defSafe, amount, 1D, 0D, 0);
-    }
-
-    public cElementalInstanceStack(iElementalDefinition defSafe, double amount, double lifeTimeMult, double age, long energy) {
-        definition = defSafe == null ? null__ : defSafe;
-        byte bColor = definition.getColor();
-        if (bColor < 0 || bColor > 2) {//transforms colorable??? into proper color
-            this.color = bColor;
-        } else {
-            this.color = (byte) TecTech.RANDOM.nextInt(3);
-        }
-        this.lifeTimeMult = lifeTimeMult;
-        lifeTime = definition.getRawTimeSpan(energy) * this.lifeTimeMult;
-        setEnergy(energy);
-        this.age = age;
-        this.amount = amount;
-    }
-
-    //Clone proxy
-    private cElementalInstanceStack(cElementalInstanceStack stack) {
-        definition = stack.definition;
-        color = stack.color;
-        age = stack.age;
-        amount = stack.amount;
-        lifeTime = stack.lifeTime;
-        lifeTimeMult = stack.lifeTimeMult;
-        energy = stack.energy;
-    }
-
-    @Override
-    public cElementalInstanceStack clone() {
-        return new cElementalInstanceStack(this);
-    }
-
-    @Override
-    public cElementalInstanceStack mutateAmount(double amount) {
-        this.amount = amount;
-        return this;
-    }
-
-    @Override
-    public double getAmount() {
-        return amount;
-    }
-
-    @Override
-    public double getCharge() {
-        return definition.getCharge() * amount;
-    }
-
-    @Override
-    public double getMass() {
-        return definition.getMass() * amount;
-    }
-
-    public long getEnergy() {
-        return energy;
-    }
-
-    public void setEnergy(long newEnergyLevel){
-        energy=newEnergyLevel;
-        setLifeTimeMultiplier(getLifeTimeMultiplier());
-    }
-
-    public double getEnergySettingCost(long currentEnergyLevel, long newEnergyLevel){
-        return definition.getEnergyDiffBetweenStates(currentEnergyLevel,newEnergyLevel)*amount;
-    }
-
-    public double getEnergySettingCost(long newEnergyLevel){
-        return definition.getEnergyDiffBetweenStates(energy,newEnergyLevel)*amount;
-    }
-
-    public cElementalDefinitionStack getDefinitionStack() {
-        return new cElementalDefinitionStack(definition, amount);
-    }
-
-    @Override
-    public iElementalDefinition getDefinition() {
-        return definition;
-    }
-
-    public byte getColor() {
-        return color;
-    }
-
-    public byte setColor(byte color) {//does not allow changing magic element
-        if (this.color < 0 || this.color > 2 || color < 0 || color >= 3) {
-            return this.color;
-        }
-        return this.color = color;
-    }
-
-    public byte nextColor() {//does not allow changing magic element
-        if (color < 0 || color > 2) {
-            return color;
-        }
-        return color = (byte) TecTech.RANDOM.nextInt(3);
-    }
-
-    public double getLifeTime() {
-        return lifeTime;
-    }
-
-    public double setLifeTimeMultiplier(double mult) {
-        if(mult<=0) //since infinity*0=nan
-        {
-            throw new IllegalArgumentException("multiplier must be >0");
-        }
-        lifeTimeMult = mult;
-        if (definition.getRawTimeSpan(energy) <= 0) {
-            return lifeTime;
-        }
-        lifeTime = definition.getRawTimeSpan(energy) * lifeTimeMult;
-        return lifeTime;
-    }
-
-    public double getLifeTimeMultiplier() {
-        return lifeTimeMult;
-    }
-
-    public cElementalDecayResult tickStackByOneSecond(double lifeTimeMult, int postEnergize){
-        return tickStack(lifeTimeMult,postEnergize,1D);
-    }
-
-    public cElementalDecayResult tickStack(double lifeTimeMult, int postEnergize, double seconds){
-        cElementalDecayResult newInstances = decay(lifeTimeMult, age += seconds, postEnergize);
-        if (newInstances == null) {
-            nextColor();
-        } else {
-            for (cElementalInstanceStack newInstance : newInstances.getOutput().valuesToArray()) {
-                newInstance.nextColor();
-            }
-        }
-        return newInstances;
-    }
-
-    public cElementalDecayResult decay() {
-        return decay(1D, age, 0);//try to decay without changes
-    }
-
-    public cElementalDecayResult decay(double apparentAge, long postEnergize) {
-        return decay(1D,apparentAge,postEnergize);
-    }
-
-    public cElementalDecayResult decay(double lifeTimeMult, double apparentAge, long postEnergize) {
-        long newEnergyLevel = postEnergize + energy;
-        if (newEnergyLevel > 0) {
-            newEnergyLevel -= 1;
-        } else if (newEnergyLevel < 0) {
-            newEnergyLevel += 1;
-        }
-        cElementalDecayResult output;
-        if(definition.usesMultipleDecayCalls(energy)){
-            double amountTemp=amount;
-            int decayCnt=(int) min(MAX_MULTIPLE_DECAY_CALLS,max(amount/DECAY_CALL_PER,MIN_MULTIPLE_DECAY_CALLS));
-            amount= div(amount,decayCnt);
-            decayCnt--;
-
-            output=decayMechanics(lifeTimeMult,apparentAge,newEnergyLevel);
-            if(output==null){
-                amount=amountTemp;
-                return null;
-            }
-
-            for(int i=0;i<decayCnt;i++){
-                cElementalDecayResult map=decayMechanics(lifeTimeMult,apparentAge,newEnergyLevel);
-                if(map!=null){
-                    output.getOutput().putUnifyAll(map.getOutput());
-                    output.setMassDiff(add(output.getMassDiff(),map.getMassDiff()));
-                    output.setMassAffected(output.getMassDiff()+map.getMassDiff());
-                }
-            }
-            amount=amountTemp;
-        }else{
-            output=decayMechanics(lifeTimeMult,apparentAge,newEnergyLevel);
-        }
-        if(output!=null){
-            output.getOutput().cleanUp();
-        }
-        return output;
-    }
-
-    private cElementalDecayResult decayMechanics(double lifeTimeMult, double apparentAge, long newEnergyLevel) {
-        if (energy > 0 && !definition.usesSpecialEnergeticDecayHandling()) {
-            setLifeTimeMultiplier(getLifeTimeMultiplier());
-            return decayCompute(definition.getEnergyInducedDecay(energy), lifeTimeMult, -1D, newEnergyLevel);
-        } else if (definition.getRawTimeSpan(energy) < 0) {
-            return null;//return null, decay cannot be achieved
-        } else if (definition.isTimeSpanHalfLife()) {
-            return exponentialDecayCompute(energy > 0 ? definition.getEnergyInducedDecay(energy) : definition.getDecayArray(), lifeTimeMult, -1D, newEnergyLevel);
-        } else {
-            if (1 > lifeTime) {
-                return decayCompute(energy > 0 ? definition.getEnergyInducedDecay(energy) : definition.getNaturalDecayInstant(), lifeTimeMult, 0D, newEnergyLevel);
-            } else if (apparentAge > lifeTime) {
-                return decayCompute(energy > 0 ? definition.getEnergyInducedDecay(energy) : definition.getDecayArray(), lifeTimeMult, 0D, newEnergyLevel);
-            }
-        }
-        return null;//return null since decay cannot be achieved
-    }
-
-    //Use to get direct decay output providing correct decay array
-    private cElementalDecayResult exponentialDecayCompute(cElementalDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
-        double newAmount= div(amount,Math.pow(2D,1D/* 1 second *//lifeTime));
-
-        //if(definition.getSymbol().startsWith("U ")) {
-        //    System.out.println("newAmount = " + newAmount);
-        //    System.out.println("amountRemaining = " + amountRemaining);
-        //    for(cElementalDecay decay:decays){
-        //        System.out.println("prob = "+decay.probability);
-        //        for(cElementalDefinitionStack stack:decay.outputStacks.values()){
-        //            System.out.println("stack = " + stack.getDefinition().getSymbol() + " " + stack.amount);
-        //        }
-        //    }
-        //}
-        if(newAmount==amount) {
-            newAmount-=ulp(newAmount);
-        } else if(newAmount<1) {
-            return decayCompute(decays, lifeTimeMult, newProductsAge, newEnergyLevel);
-        }
-
-        //split to non decaying and decaying part
-        double amount=this.amount;
-        this.amount-=newAmount;
-        cElementalDecayResult products=decayCompute(decays,lifeTimeMult,newProductsAge,newEnergyLevel);
-        this.amount=newAmount;
-        if(products!=null){
-            products.getOutput().putUnify(clone());
-        }
-        this.amount=amount;
-        return products;
-    }
-
-    //Use to get direct decay output providing correct decay array
-    private cElementalDecayResult decayCompute(cElementalDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
-        if (decays == null) {
-            return null;//Can not decay so it wont
-        }
-        boolean makesEnergy=definition.decayMakesEnergy(energy);
-        double mass=getMass();
-        if (decays.length == 0) {
-            return makesEnergy ? null : new cElementalDecayResult(new cElementalInstanceStackMap(), mass, 0);
-            //provide non null 0 length array for annihilation
-        } else if (decays.length == 1) {//only one type of decay :D, doesn't need dead end
-            if(decays[0]==deadEnd) {
-                return makesEnergy ? null : new cElementalDecayResult(decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, amount), mass, 0);
-            }
-            cElementalInstanceStackMap output = decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, amount);
-            if(newProductsAge<0){
-                if(output.size()==1) {
-                    if(output.size()==1 && output.getFirst().definition.equals(definition)) {
-                        output.getFirst().setEnergy(energy);
-                        output.getFirst().age=age;
-                    }
-                }else {
-                    for (cElementalInstanceStack stack : output.valuesToArray()) {
-                        if (stack.definition.equals(definition)) {
-                            stack.age = age;
-                        }
-                    }
-                }
-            }else{
-                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
-                    output.getFirst().setEnergy(energy);
-                }
-            }
-            if(energy <= 0 && output.getMass() > mass){
-                return null;//no energy usage to decay
-            }
-            return new cElementalDecayResult(new cElementalInstanceStackMap(), mass, makesEnergy ? output.getMass()-mass:0);
-        } else {
-            cElementalDecayResult totalOutput = new cElementalDecayResult(new cElementalInstanceStackMap(),getMass(),0);
-            cElementalInstanceStackMap output=totalOutput.getOutput(),results;
-            int differentDecays = decays.length;
-            double[] probabilities=new double[differentDecays];
-            for (int i = 0; i < probabilities.length; i++) {
-                probabilities[i]=decays[i].probability;
-            }
-            double[] qttyOfDecay;
-            try{
-                qttyOfDecay = distribute(amount, probabilities);
-            }catch (ArithmeticException e){
-                Minecraft.getMinecraft().crashed(new CrashReport("Decay failed for: "+this.toString(),e));
-                return null;
-            }
-            //long amountRemaining = this.amount, amount = this.amount;
-            //float remainingProbability = 1D;
-//
-            //for (int i = 0; i < differentDecays; i++) {
-            //    if (decays[i].probability >= 1D) {
-            //        long thisDecayAmount = (long) Math.floor(remainingProbability * (double) amount);
-            //        if (thisDecayAmount > 0) {
-            //            if (thisDecayAmount <= amountRemaining) {
-            //                amountRemaining -= thisDecayAmount;
-            //                qttyOfDecay[i] += thisDecayAmount;
-            //            }else {//in case too much was made
-            //                qttyOfDecay[i] += amountRemaining;
-            //                amountRemaining = 0;
-            //                //remainingProbability=0;
-            //            }
-            //        }
-            //        break;
-            //    }
-            //    long thisDecayAmount = (long) Math.floor(decays[i].probability * (double) amount);
-            //    if (thisDecayAmount <= amountRemaining && thisDecayAmount > 0) {//some was made
-            //        amountRemaining -= thisDecayAmount;
-            //        qttyOfDecay[i] += thisDecayAmount;
-            //    } else if (thisDecayAmount > amountRemaining) {//too much was made
-            //        qttyOfDecay[i] += amountRemaining;
-            //        amountRemaining = 0;
-            //        //remainingProbability=0;
-            //        break;
-            //    }
-            //    remainingProbability -= decays[i].probability;
-            //    if(remainingProbability<=0) {
-            //        break;
-            //    }
-            //}
-
-            //for (int i = 0; i < amountRemaining; i++) {
-            //    double rand = TecTech.RANDOM.nextDouble();
-            //    for (int j = 0; j < differentDecays; j++) {//looking for the thing it decayed into
-            //        rand -= decays[j].probability;
-            //        if (rand <= 0D) {
-            //            qttyOfDecay[j]++;
-            //            break;
-            //        }
-            //    }
-            //}
-
-            if(definition.decayMakesEnergy(energy)){
-                for (int i = differentDecays - 1; i >= 0; i--) {
-                    if(decays[i]==deadEnd){
-                        cElementalInstanceStack clone=clone();
-                        clone.amount=qttyOfDecay[i];
-                        output.putUnify(clone);
-                    }else {
-                        results=decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
-                        output.putUnifyAll(results);
-                        totalOutput.setMassDiff(add(totalOutput.getMassDiff(),results.getMass()-mass));
-                    }
-                }
-            }else{
-                for (int i = differentDecays - 1; i >= 0; i--) {
-                    results=decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
-                    output.putUnifyAll(results);
-                }
-            }
-
-            if(newProductsAge<0) {
-                if (output.size() == 1 && output.getFirst().definition.equals(definition)) {
-                    output.getFirst().setEnergy(energy);
-                    output.getFirst().age = age;
-                } else {
-                    for (cElementalInstanceStack stack : output.valuesToArray()) {
-                        if (stack.definition.equals(definition)) {
-                            stack.age = age;
-                        }
-                    }
-                }
-            }else{
-                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
-                    output.getFirst().setEnergy(energy);
-                    output.getFirst().age=age;
-                }
-            }
-            if(energy <= 0 && output.getMass() > getMass()){
-                return null;//no energy usage to decay
-            }
-            return totalOutput;
-        }
-    }
-
-    public cElementalInstanceStack unifyIntoThis(cElementalInstanceStack... instances) {
-        if (instances == null) {
-            return this;
-        }
-        //returns with the definition from the first object passed
-        double energyTotal = this.energy * amount;
-        long maxEnergy=this.energy;
-        double lifeTimeMul = lifeTimeMult;
-
-        for (cElementalInstanceStack instance : instances) {
-            if (instance != null && compareTo(instance) == 0) {
-                amount= add(amount,instance.amount);
-                energyTotal += instance.energy * instance.amount;
-                if(instance.energy>maxEnergy){
-                    maxEnergy=instance.energy;
-                }
-                lifeTimeMul = min(lifeTimeMul, instance.lifeTimeMult);
-                age = max(age, instance.age);
-            }
-        }
-
-        if (amount != 0) {
-            energyTotal /= Math.abs(amount);
-        }
-
-        double wholeParts=Math.floor(energyTotal);
-        energyTotal= min(energyTotal-wholeParts,1D)+(wholeParts>=0?-0.11709966304863834D:0.11709966304863834D);
-        long energy=(long) wholeParts + ((energyTotal > TecTech.RANDOM.nextDouble()) ? 1 : 0);
-        if(energy*energyTotal<0){
-            energy=0;
-        }
-        setEnergy(min(maxEnergy,energy));
-        return this;
-    }
-
-    public void addScanShortSymbols(ArrayList<String> lines, int[] detailsOnDepthLevels){
-        int capabilities=detailsOnDepthLevels[0];
-        definition.addScanShortSymbols(lines,capabilities,energy);
-        //scanShortSymbolsContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
-    }
-
-    //private void scanShortSymbolsContents(ArrayList<String> lines, cElementalDefinitionStackMap definitions, int depth, int[] detailsOnDepthLevels){
-    //    if(definitions!=null && depth<detailsOnDepthLevels.length){
-    //        int deeper=depth+1;
-    //        for(cElementalDefinitionStack definitionStack:definitions.values()) {
-    //            definition.addScanShortSymbols(lines,detailsOnDepthLevels[depth],energy);
-    //            scanSymbolsContents(lines,definitionStack.definition.getSubParticles(),deeper,detailsOnDepthLevels);
-    //        }
-    //    }
-    //}
-
-    public void addScanResults(ArrayList<String> lines, int[] detailsOnDepthLevels){
-        int capabilities=detailsOnDepthLevels[0];
-        if(Util.areBitsSet(SCAN_GET_DEPTH_LEVEL,capabilities)) {
-            lines.add("DEPTH = " + 0);
-        }
-        definition.addScanResults(lines,capabilities,energy);
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_MULT,capabilities)) {
-            lines.add("TIME MULT = " + lifeTimeMult);
-            if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO,capabilities)) {
-                lines.add("TIME SPAN = " + lifeTime + " s");
-            }
-        }
-        if(Util.areBitsSet(SCAN_GET_AGE,capabilities)) {
-            lines.add("AGE = " + age + " s");
-        }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add("COLOR = " + color + " RGB or CMY");
-        }
-        if(Util.areBitsSet(SCAN_GET_ENERGY_LEVEL,capabilities)) {
-            lines.add("ENERGY = " + energy);
-        }
-        if(Util.areBitsSet(SCAN_GET_AMOUNT,capabilities)) {
-            lines.add("AMOUNT = " + amount/ AVOGADRO_CONSTANT +" mol");
-        }
-        scanContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
-    }
-
-    private void scanContents(ArrayList<String> lines, cElementalConstantStackMap definitions, int depth, int[] detailsOnDepthLevels){
-        if(definitions!=null && depth<detailsOnDepthLevels.length){
-            int deeper=depth+1;
-            for(cElementalDefinitionStack definitionStack:definitions.valuesToArray()) {
-                lines.add("");//def separator
-                if(Util.areBitsSet(SCAN_GET_DEPTH_LEVEL,detailsOnDepthLevels[depth])) {
-                    lines.add("DEPTH = " + depth);
-                }
-                definition.addScanResults(lines,detailsOnDepthLevels[depth],energy);
-                if(Util.areBitsSet(SCAN_GET_AMOUNT,detailsOnDepthLevels[depth])) {
-                    lines.add("AMOUNT = " + definitionStack.amount);
-                }
-                scanContents(lines,definitionStack.definition.getSubParticles(),deeper,detailsOnDepthLevels);
-            }
-        }
-    }
-
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", definition.toNBT());
-        nbt.setDouble("Q", amount);
-        nbt.setLong("e", energy);
-        nbt.setByte("c", color);
-        nbt.setDouble("A", age);
-        nbt.setDouble("M", lifeTimeMult);
-        return nbt;
-    }
-
-    public static cElementalInstanceStack fromNBT(NBTTagCompound nbt) {
-        NBTTagCompound definition = nbt.getCompoundTag("d");
-        cElementalInstanceStack instance = new cElementalInstanceStack(
-                cElementalDefinition.fromNBT(definition),
-                nbt.getLong("q")+nbt.getDouble("Q"),
-                nbt.getFloat("m")+nbt.getDouble("M"),
-                nbt.getLong("a")+nbt.getDouble("A"),
-                nbt.getLong("e"));
-        instance.setColor(nbt.getByte("c"));
-        return instance;
-    }
-
-    @Override
-    public int compareTo(iElementalStack o) {//use for unification
-        return definition.compareTo(o.getDefinition());
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof iElementalDefinition) {
-            return definition.compareTo((iElementalDefinition) obj) == 0;
-        }
-        if (obj instanceof iElementalStack) {
-            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    //Amount shouldn't be hashed if this is just indicating amount and not structure, DOES NOT CARE ABOUT creativeTabTecTech INFO
-    @Override
-    public int hashCode() {
-        return definition.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return definition.toString() + '\n' + amount/ AVOGADRO_CONSTANT + " mol\n" + getMass();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
deleted file mode 100644
index 65f2ed3b78..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Created by danie_000 on 30.01.2017.
- */
-public interface iElementalStack extends Comparable<iElementalStack>,Cloneable {
-    iElementalDefinition getDefinition();
-
-    double getAmount();
-
-    double getCharge();
-
-    double getMass();
-
-    iElementalStack clone();
-
-    iElementalStack mutateAmount(double amount);
-
-    NBTTagCompound toNBT();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java
deleted file mode 100644
index 2adadfd062..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-/**
- * Created by danie_000 on 19.11.2016.
- */
-public final class tElementalException extends Exception {
-    public tElementalException(String message) {
-        super(message);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
new file mode 100644
index 0000000000..7fc074bded
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
@@ -0,0 +1,135 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 23.01.2017.
+ */
+public abstract class EMComplex implements IEMDefinition {
+    //Nothing array
+    public static final IEMDefinition[] nothing = new EMPrimitive[0];
+
+    //add text based creators for recipe formula input?
+    private static final Map<Byte, Method> nbtCreationBind = new HashMap<>();//creator methods in subclasses
+    private static final HashSet<Byte> classSet = new HashSet<>();
+
+    protected static void addCreatorFromNBT(byte shortcutNBT, Method constructorFromNBT,byte classID) {
+        if(nbtCreationBind.put(shortcutNBT, constructorFromNBT)!=null) {
+            throw new Error("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
+        }
+        if(!classSet.add(classID)) {
+            throw new Error("Duplicate Class ID! " + classID + " used for class comparison");
+        }
+    }
+
+    public static Map<Byte, Method> getBindsComplex(){
+        return nbtCreationBind;
+    }
+
+    @Override
+    public final EMComplex clone() {
+        return this;//IMMUTABLE
+    }
+
+    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
+        try {
+            return (IEMDefinition) nbtCreationBind.get(nbt.getByte("t")).invoke(null, nbt);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return nbtE__;
+        }
+    }
+
+    @Override
+    public int compareTo(IEMDefinition o) {
+        int classCompare = compareClassID(o);
+        if (classCompare != 0) {
+            return classCompare;
+        }
+
+        //only of the internal def stacks!!!
+        //that allows neat check if the same thing and
+        //top hierarchy amount can be used to store amount info
+        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
+    }
+
+    //use only for nested operations!
+    private static int compareInnerContentsWithAmounts(EMDefinitionStack[] tc, EMDefinitionStack[] sc) {
+        if (tc == null) {
+            if (sc == null) {
+                return 0;
+            } else {
+                return -1;
+            }
+        }
+        if (sc == null) {
+            return 1;
+        }
+
+        int lenDiff = tc.length - sc.length;
+        if (lenDiff != 0) {
+            return lenDiff;
+        }
+
+        for (int i = 0; i < tc.length; i++) {
+            int cn = tc[i].getDefinition().compareTo(sc[i].getDefinition());
+            if (cn != 0) {
+                return cn;
+            }
+
+            if (tc[i].getAmount() > sc[i].getAmount()) {
+                return 1;
+            }
+            if (tc[i].getAmount() < sc[i].getAmount()) {
+                return -1;
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public final EMDefinitionStack getStackForm(double amount) {
+        return new EMDefinitionStack(this, amount);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        if(this==obj) {
+            return true;
+        }
+        if (obj instanceof IEMDefinition) {
+            return compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Internal amounts should be also hashed
+        int hash = -(getSubParticles().size() << 4);
+        for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
+            int amount=(int) stack.getAmount();
+            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return getLocalizedName()+ '\n' + getSymbol();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
new file mode 100644
index 0000000000..587affd0f1
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
@@ -0,0 +1,283 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.client.Minecraft;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+
+import static com.github.technus.tectech.util.Util.areBitsSet;
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!  (-1 to 32 can be assumed as used)
+ */
+public abstract class EMPrimitive extends EMComplex {
+    public static final byte nbtType = (byte) 'p';
+
+    private static final Map<Integer, EMPrimitive> bindsBO = new HashMap<>();
+
+    public static Map<Integer, EMPrimitive> getBindsPrimitive() {
+        return bindsBO;
+    }
+
+    private final String name;
+    private final String symbol;
+    //float-mass in eV/c^2
+    private final double mass;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    charge;
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
+    private final byte   color;
+    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
+    private final byte type;
+
+    private EMPrimitive anti;//IMMUTABLE
+    private EMDecay[]   elementalDecays;
+    private byte                naturalDecayInstant;
+    private byte energeticDecayInstant;
+    private double rawLifeTime;
+
+    private final int ID;
+
+    //no _ at end - normal particle
+    //   _ at end - anti particle
+    //  __ at end - self is antiparticle
+
+    protected EMPrimitive(String name, String symbol, int type, double mass, int charge, int color, int ID) {
+        this.name = name;
+        this.symbol = symbol;
+        this.type = (byte) type;
+        this.mass = mass;
+        this.charge = charge;
+        this.color = (byte) color;
+        this.ID = ID;
+        if (bindsBO.put(ID, this) != null) {
+            Minecraft.getMinecraft().crashed(new CrashReport("Primitive definition", new EMException("Duplicate ID")));
+        }
+        STACKS_REGISTERED.add(this);
+    }
+
+    //
+    protected void init(EMPrimitive antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
+        anti = antiParticle;
+        this.rawLifeTime = rawLifeTime;
+        naturalDecayInstant = (byte) naturalInstant;
+        energeticDecayInstant = (byte) energeticInstant;
+        elementalDecays =elementalDecaysArray;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Undefined: " + getName();
+    }
+
+    @Override
+    public String getSymbol() {
+        return symbol;
+    }
+
+    @Override
+    public String getShortSymbol() {
+        return getSymbol();
+    }
+
+    @Override
+    public IEMDefinition getAnti() {
+        return anti;//no need for copy
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    @Override
+    public byte getColor() {
+        return color;
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        if (naturalDecayInstant < 0) {
+            return elementalDecays;
+        }else if (naturalDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[naturalDecayInstant]};
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        if (energeticDecayInstant < 0) {
+            return elementalDecays;
+        }else if (energeticDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[energeticDecayInstant]};
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        return elementalDecays;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return rawLifeTime;
+    }
+
+    @Override
+    public final EMConstantStackMap getSubParticles() {
+        return null;
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public byte getType() {
+        return type;
+    }
+
+    @Override
+    public final NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setByte("t", nbtType);
+        nbt.setInteger("c", getID());
+        return nbt;
+    }
+
+    public static EMPrimitive fromNBT(NBTTagCompound content) {
+        EMPrimitive primitive = bindsBO.get(content.getInteger("c"));
+        return primitive == null ? null__ : primitive;
+    }
+
+    @Override
+    public final byte getClassType() {
+        return -128;
+    }
+
+    public static byte getClassTypeStatic(){
+        return -128;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+        }
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+ getLocalizedName());
+            lines.add("SYMBOL = "+getSymbol());
+        }
+        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    "+"At current energy level");
+        }
+    }
+
+    public static void run() {
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMPrimitive.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-128);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Primitive " + nbtType + ' ' + -128);
+        }
+    }
+
+    @Override
+    public final int compareTo(IEMDefinition o) {
+        if (getClassType() == o.getClassType()) {
+            int oID = ((EMPrimitive) o).getID();
+            return Integer.compare(getID(), oID);
+        }
+        return compareClassID(o);
+    }
+
+    @Override
+    public final int hashCode() {
+        return getID();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getID() {
+        return ID;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
new file mode 100644
index 0000000000..7ae6d0395c
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
@@ -0,0 +1,84 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+/**
+ * Created by danie_000 on 11.11.2016.
+ */
+public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IMMUTABLE
+    double STABLE_RAW_LIFE_TIME =1.5e36D;
+    double NO_DECAY_RAW_LIFE_TIME=-1D;
+    long DEFAULT_ENERGY_LEVEL=0;
+    double DEFAULT_ENERGY_REQUIREMENT=25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
+
+    //Nomenclature
+    String getLocalizedName();
+
+    String getSymbol();
+
+    String getShortSymbol();
+
+    void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    byte getType();
+
+    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
+
+    //Not dynamically changing stuff
+    IEMDefinition getAnti();//gives new anti particle def
+
+    EMDecay[] getDecayArray();//possible decays
+
+    EMDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
+
+    EMDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
+
+    boolean usesSpecialEnergeticDecayHandling();
+
+    boolean usesMultipleDecayCalls(long energyLevel);
+
+    boolean decayMakesEnergy(long energyLevel);
+
+    boolean fusionMakesEnergy(long energyLevel);
+
+    double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
+
+    double getMass();//mass... MeV/c^2
+
+    int getCharge();//charge 1/3 electron charge
+
+    //dynamically changing stuff
+    byte getColor();//-1 nope cannot 0 it can but undefined
+
+    double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
+
+    boolean isTimeSpanHalfLife();
+
+    EMConstantStackMap getSubParticles();//contents... null if none
+
+    EMFluidDequantizationInfo someAmountIntoFluidStack();
+
+    EMItemDequantizationInfo someAmountIntoItemsStack();
+
+    EMOredictDequantizationInfo someAmountIntoOredictStack();
+
+    NBTTagCompound toNBT();
+
+    EMDefinitionStack getStackForm(double amount);
+
+    IEMDefinition clone();
+
+    default int compareClassID(IEMDefinition obj) {
+        return (int) getClassType() - obj.getClassType();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
deleted file mode 100644
index 43e42df988..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 23.01.2017.
- */
-public abstract class cElementalDefinition extends iElementalDefinition {
-    //Nothing array
-    public static final iElementalDefinition[] nothing = new cElementalPrimitive[0];
-
-    //add text based creators for recipe formula input?
-    private static final Map<Byte, Method> nbtCreationBind = new HashMap<>();//creator methods in subclasses
-    private static final HashSet<Byte> classSet = new HashSet<>();
-
-    protected static void addCreatorFromNBT(byte shortcutNBT, Method constructorFromNBT,byte classID) {
-        if(nbtCreationBind.put(shortcutNBT, constructorFromNBT)!=null) {
-            throw new Error("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
-        }
-        if(!classSet.add(classID)) {
-            throw new Error("Duplicate Class ID! " + classID + " used for class comparison");
-        }
-    }
-
-    public static Map<Byte, Method> getBindsComplex(){
-        return nbtCreationBind;
-    }
-
-    @Override
-    public final cElementalDefinition clone() {
-        return this;//IMMUTABLE
-    }
-
-    public static iElementalDefinition fromNBT(NBTTagCompound nbt) {
-        try {
-            return (iElementalDefinition) nbtCreationBind.get(nbt.getByte("t")).invoke(null, nbt);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return nbtE__;
-        }
-    }
-
-    @Override
-    public int compareTo(iElementalDefinition o) {
-        int classCompare = compareClassID(o);
-        if (classCompare != 0) {
-            return classCompare;
-        }
-
-        //only of the internal def stacks!!!
-        //that allows neat check if the same thing and
-        //top hierarchy amount can be used to store amount info
-        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
-    }
-
-    //use only for nested operations!
-    private static int compareInnerContentsWithAmounts(cElementalDefinitionStack[] tc, cElementalDefinitionStack[] sc) {
-        if (tc == null) {
-            if (sc == null) {
-                return 0;
-            } else {
-                return -1;
-            }
-        }
-        if (sc == null) {
-            return 1;
-        }
-
-        int lenDiff = tc.length - sc.length;
-        if (lenDiff != 0) {
-            return lenDiff;
-        }
-
-        for (int i = 0; i < tc.length; i++) {
-            int cn = tc[i].definition.compareTo(sc[i].definition);
-            if (cn != 0) {
-                return cn;
-            }
-
-            if (tc[i].amount > sc[i].amount) {
-                return 1;
-            }
-            if (tc[i].amount < sc[i].amount) {
-                return -1;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public final cElementalDefinitionStack getStackForm(double amount) {
-        return new cElementalDefinitionStack(this, amount);
-    }
-
-    @Override
-    public final boolean equals(Object obj) {
-        if(this==obj) {
-            return true;
-        }
-        if (obj instanceof iElementalDefinition) {
-            return compareTo((iElementalDefinition) obj) == 0;
-        }
-        if (obj instanceof iElementalStack) {
-            return compareTo(((iElementalStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Internal amounts should be also hashed
-        int hash = -(getSubParticles().size() << 4);
-        for (cElementalDefinitionStack stack : getSubParticles().valuesToArray()) {
-            int amount=(int)stack.amount;
-            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.definition.hashCode();
-        }
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return getName()+ '\n' + getSymbol();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
deleted file mode 100644
index 70af6445c9..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import net.minecraft.client.Minecraft;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-
-import static com.github.technus.tectech.util.Util.areBitsSet;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!  (-1 to 32 can be assumed as used)
- */
-public abstract class cElementalPrimitive extends cElementalDefinition {
-    public static final byte nbtType = (byte) 'p';
-
-    private static final Map<Integer, cElementalPrimitive> bindsBO = new HashMap<>();
-
-    public static Map<Integer, cElementalPrimitive> getBindsPrimitive() {
-        return bindsBO;
-    }
-
-    public final String name;
-    public final String symbol;
-    //float-mass in eV/c^2
-    public final double mass;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    public final byte charge;
-    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    public final byte color;
-    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
-    public final byte type;
-
-    private cElementalPrimitive anti;//IMMUTABLE
-    private cElementalDecay[] elementalDecays;
-    private byte naturalDecayInstant;
-    private byte energeticDecayInstant;
-    private double rawLifeTime;
-
-    public final int ID;
-
-    //no _ at end - normal particle
-    //   _ at end - anti particle
-    //  __ at end - self is antiparticle
-
-    protected cElementalPrimitive(String name, String symbol, int type, double mass, int charge, int color, int ID) {
-        this.name = name;
-        this.symbol = symbol;
-        this.type = (byte) type;
-        this.mass = mass;
-        this.charge = (byte) charge;
-        this.color = (byte) color;
-        this.ID = ID;
-        if (bindsBO.put(ID, this) != null) {
-            Minecraft.getMinecraft().crashed(new CrashReport("Primitive definition", new tElementalException("Duplicate ID")));
-        }
-        STACKS_REGISTERED.add(this);
-    }
-
-    //
-    protected void init(cElementalPrimitive antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, cElementalDecay... elementalDecaysArray) {
-        anti = antiParticle;
-        this.rawLifeTime = rawLifeTime;
-        naturalDecayInstant = (byte) naturalInstant;
-        energeticDecayInstant = (byte) energeticInstant;
-        elementalDecays =elementalDecaysArray;
-    }
-
-    @Override
-    public String getName() {
-        return "Undefined: " + name;
-    }
-
-    @Override
-    public String getSymbol() {
-        return symbol;
-    }
-
-    @Override
-    public String getShortSymbol() {
-        return symbol;
-    }
-
-    @Override
-    public iElementalDefinition getAnti() {
-        return anti;//no need for copy
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    @Override
-    public byte getColor() {
-        return color;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        if (naturalDecayInstant < 0) {
-            return elementalDecays;
-        }else if (naturalDecayInstant>=elementalDecays.length){
-            return cElementalDecay.noProduct;
-        }
-        return new cElementalDecay[]{elementalDecays[naturalDecayInstant]};
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        if (energeticDecayInstant < 0) {
-            return elementalDecays;
-        }else if (energeticDecayInstant>=elementalDecays.length){
-            return cElementalDecay.noProduct;
-        }
-        return new cElementalDecay[]{elementalDecays[energeticDecayInstant]};
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        return elementalDecays;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return rawLifeTime;
-    }
-
-    @Override
-    public final cElementalConstantStackMap getSubParticles() {
-        return null;
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    @Override
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        nbt.setInteger("c", ID);
-        return nbt;
-    }
-
-    public static cElementalPrimitive fromNBT(NBTTagCompound content) {
-        cElementalPrimitive primitive = bindsBO.get(content.getInteger("c"));
-        return primitive == null ? null__ : primitive;
-    }
-
-    @Override
-    public final byte getClassType() {
-        return -128;
-    }
-
-    public static byte getClassTypeStatic(){
-        return -128;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getName());
-            lines.add("SYMBOL = "+getSymbol());
-        }
-        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
-        }
-    }
-
-    public static void run() {
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, cElementalPrimitive.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-128);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Primitive " + nbtType + ' ' + -128);
-        }
-    }
-
-    @Override
-    public final int compareTo(iElementalDefinition o) {
-        if (getClassType() == o.getClassType()) {
-            int oID = ((cElementalPrimitive) o).ID;
-            return Integer.compare(ID, oID);
-        }
-        return compareClassID(o);
-    }
-
-    @Override
-    public final int hashCode() {
-        return ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
deleted file mode 100644
index 8065e9c170..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-/**
- * Created by danie_000 on 11.11.2016.
- */
-public abstract class iElementalDefinition implements Comparable<iElementalDefinition>,Cloneable {//IMMUTABLE
-    public static final double STABLE_RAW_LIFE_TIME =1.5e36D;
-    public static final double NO_DECAY_RAW_LIFE_TIME=-1D;
-    public static final long DEFAULT_ENERGY_LEVEL=0;
-    public static final double DEFAULT_ENERGY_REQUIREMENT=25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
-
-    //Nomenclature
-    public abstract String getName();
-
-    public abstract String getSymbol();
-
-    public abstract String getShortSymbol();
-
-    public abstract void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    public abstract void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    public abstract byte getType();
-
-    public abstract byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
-
-    //Not dynamically changing stuff
-    public abstract iElementalDefinition getAnti();//gives new anti particle def
-
-    public abstract cElementalDecay[] getDecayArray();//possible decays
-
-    public abstract cElementalDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
-
-    public abstract cElementalDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
-
-    public abstract boolean usesSpecialEnergeticDecayHandling();
-
-    public abstract boolean usesMultipleDecayCalls(long energyLevel);
-
-    public abstract boolean decayMakesEnergy(long energyLevel);
-
-    public abstract boolean fusionMakesEnergy(long energyLevel);
-
-    public abstract double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
-
-    public abstract double getMass();//mass... MeV/c^2
-
-    public abstract int getCharge();//charge 1/3 electron charge
-
-    //dynamically changing stuff
-    public abstract byte getColor();//-1 nope cannot 0 it can but undefined
-
-    public abstract double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
-
-    public abstract boolean isTimeSpanHalfLife();
-
-    public abstract cElementalConstantStackMap getSubParticles();//contents... null if none
-
-    public abstract aFluidDequantizationInfo someAmountIntoFluidStack();
-
-    public abstract aItemDequantizationInfo someAmountIntoItemsStack();
-
-    public abstract aOredictDequantizationInfo someAmountIntoOredictStack();
-
-    public abstract NBTTagCompound toNBT();
-
-    public abstract cElementalDefinitionStack getStackForm(double amount);
-
-    @Override
-    public abstract iElementalDefinition clone();
-
-    final int compareClassID(iElementalDefinition obj) {
-        return (int) getClassType() - obj.getClassType();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
new file mode 100644
index 0000000000..d74c36170e
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
@@ -0,0 +1,43 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMFluidDequantizationInfo implements IEMExchangeInfo<IEMStack,FluidStack> {
+    private final IEMStack   in;
+    private final FluidStack out;
+
+    public EMFluidDequantizationInfo(IEMStack emIn, FluidStack fluidStackOut){
+        in=emIn;
+        out=fluidStackOut;
+    }
+
+    public EMFluidDequantizationInfo(IEMStack emIn, Fluid fluid, int fluidAmount){
+        in=emIn;
+        out=new FluidStack(fluid,fluidAmount);
+    }
+
+    @Override
+    public IEMStack input() {
+        return in.clone();//MEH!
+    }
+
+    @Override
+    public FluidStack output() {
+        return out.copy();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getDefinition().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMFluidDequantizationInfo && hashCode() == obj.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
new file mode 100644
index 0000000000..43fb5550aa
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
@@ -0,0 +1,43 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMFluidQuantizationInfo implements IEMExchangeInfo<FluidStack, IEMStack> {
+    private final FluidStack in;
+    private final IEMStack   out;
+
+    public EMFluidQuantizationInfo(FluidStack fluidStackIn, IEMStack emOut){
+        in=fluidStackIn;
+        out=emOut;
+    }
+
+    public EMFluidQuantizationInfo(Fluid fluid, int fluidAmount, IEMStack emOut){
+        in=new FluidStack(fluid,fluidAmount);
+        out=emOut;
+    }
+
+    @Override
+    public FluidStack input() {
+        return in.copy();
+    }
+
+    @Override
+    public IEMStack output() {
+        return out.clone();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getFluidID();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMFluidQuantizationInfo && hashCode() == obj.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
new file mode 100644
index 0000000000..af741c703d
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
@@ -0,0 +1,45 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMItemDequantizationInfo implements IEMExchangeInfo<IEMStack,ItemStack> {
+    private final IEMStack  in;
+    private final ItemStack out;
+
+    public EMItemDequantizationInfo(IEMStack emIn, ItemStack itemStackOut){
+        in=emIn;
+        out=itemStackOut;
+    }
+
+    public EMItemDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int amount) {
+        in = emIn;
+        out = GT_OreDictUnificator.get(prefix, material, amount);
+    }
+
+    @Override
+    public IEMStack input() {
+        return in.clone();
+    }
+
+    @Override
+    public ItemStack output() {
+        return out.copy();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getDefinition().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMItemDequantizationInfo && hashCode() == obj.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
new file mode 100644
index 0000000000..553e806d38
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
@@ -0,0 +1,69 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMItemQuantizationInfo implements IEMExchangeInfo<ItemStack, IEMStack> {
+    private final ItemStack in;
+    private final boolean   skipNBT;
+    private final IEMStack  out;
+
+    public EMItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, IEMStack emOut) {
+        in = itemStackIn;
+        out = emOut;
+        this.skipNBT = skipNBT;
+    }
+
+    public EMItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, IEMStack emOut) {
+        in = GT_OreDictUnificator.get(prefix, material, amount);
+        out = emOut;
+        this.skipNBT = skipNBT;
+    }
+
+    @Override
+    public ItemStack input() {
+        return in.copy();
+    }
+
+    @Override
+    public IEMStack output() {
+        return out.clone();
+    }
+
+    @Override
+    public int hashCode() {
+        return (GameRegistry.findUniqueIdentifierFor(in.getItem())+":"+in.getUnlocalizedName()+ ':' +in.getItemDamage()).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if(obj instanceof EMItemQuantizationInfo){
+            //alias
+            ItemStack stack=((EMItemQuantizationInfo) obj).in;
+            if(!in.getUnlocalizedName().equals(((EMItemQuantizationInfo) obj).in.getUnlocalizedName())) {
+                return false;
+            }
+
+            if(!GameRegistry.findUniqueIdentifierFor(in.getItem()).equals(
+                GameRegistry.findUniqueIdentifierFor(((EMItemQuantizationInfo) obj).in.getItem()))) {
+                return false;
+            }
+
+            if(in.getItemDamage() != OreDictionary.WILDCARD_VALUE && stack.getItemDamage() != OreDictionary.WILDCARD_VALUE) {
+                if (in.getItemDamage() != stack.getItemDamage()) {
+                    return false;
+                }
+            }
+            return skipNBT || ItemStack.areItemStackTagsEqual(in, stack);
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
new file mode 100644
index 0000000000..c8e337c7fd
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
@@ -0,0 +1,60 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMOredictDequantizationInfo implements IEMExchangeInfo<IEMStack,String> {
+    private final IEMStack in;
+    private final String   out;
+    private final int      amount;
+
+    public EMOredictDequantizationInfo(IEMStack emIn, String name, int qty) {
+        in = emIn;
+        out =name;
+        amount = qty;
+    }
+
+    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int qty) {
+        in = emIn;
+        out = prefix.name() + material.mName;
+        amount = qty;
+    }
+
+    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, String materialName, int qty) {
+        in = emIn;
+        out = prefix.name() + materialName;
+        amount = qty;
+    }
+
+    @Override
+    public IEMStack input() {
+        return in.clone();//MEH!
+    }
+
+    @Override
+    public String output() {
+        return getOut();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getDefinition().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMOredictDequantizationInfo && hashCode() == obj.hashCode();
+    }
+
+    public String getOut() {
+        return out;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
new file mode 100644
index 0000000000..0ca0415b0d
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
@@ -0,0 +1,60 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMOredictQuantizationInfo implements IEMExchangeInfo<String, IEMStack> {
+    private final String   in;
+    private final int      amount;
+    private final IEMStack out;
+
+    public EMOredictQuantizationInfo(String name, int qty, IEMStack emOut){
+        in=name;
+        amount=qty;
+        out=emOut;
+    }
+
+    public EMOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, IEMStack emOut){
+        in=prefix.name() + material.mName;
+        amount=qty;
+        out=emOut;
+    }
+
+    public EMOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, IEMStack emOut){
+        in=prefix.name() + materialName;
+        amount=qty;
+        out=emOut;
+    }
+
+    @Override
+    public String input() {
+        return getIn();
+    }
+
+    @Override
+    public IEMStack output() {
+        return out.clone();
+    }
+
+    @Override
+    public int hashCode() {
+        return getIn().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMOredictQuantizationInfo && hashCode() == obj.hashCode();
+    }
+
+    public String getIn() {
+        return in;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
new file mode 100644
index 0000000000..fca79b0b6f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
@@ -0,0 +1,172 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static java.lang.Math.pow;
+
+/**
+ * Created by Tec on 26.05.2017.
+ */
+public class EMTransformationInfo {
+    /**
+     * Atom count per Mol
+     */
+    public static final double AVOGADRO_CONSTANT =6.02214076e23D;
+    /**
+     * Min. chance of existing
+     */
+    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
+    /**
+     * Quantity considered to be indifferent when computing stuff
+     */
+    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
+    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
+    public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
+    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON;
+    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
+    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON;
+
+    public static EMTransformationInfo TRANSFORMATION_INFO = new EMTransformationInfo();
+
+    private Map<Integer, EMFluidQuantizationInfo>               fluidQuantization;
+    private Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization;
+    private Map<Integer, EMOredictQuantizationInfo>             oredictQuantization;
+
+    private Map<IEMDefinition, EMFluidDequantizationInfo>   fluidDequantization;
+    private Map<IEMDefinition, EMItemDequantizationInfo>    itemDequantization;
+    private Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization;
+
+    private EMTransformationInfo() {
+        this(
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
+        );
+    }
+
+    public EMTransformationInfo(
+            Map<Integer, EMFluidQuantizationInfo> fluidQuantization,
+            Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization,
+            Map<Integer, EMOredictQuantizationInfo> oredictQuantization,
+            Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization,
+            Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization,
+            Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
+        this.setFluidQuantization(fluidQuantization);
+        this.setItemQuantization(itemQuantization);
+        this.setOredictQuantization(oredictQuantization);
+        this.setFluidDequantization(fluidDequantization);
+        this.setItemDequantization(itemDequantization);
+        this.setOredictDequantization(oredictDequantization);
+    }
+
+    public void addFluid(IEMStack em, FluidStack fluidStack){
+        getFluidQuantization().put(fluidStack.getFluidID(),new EMFluidQuantizationInfo(fluidStack,em));
+        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluidStack));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addFluid(IEMStack em, Fluid fluid, int fluidAmount){
+        getFluidQuantization().put(fluid.getID(),new EMFluidQuantizationInfo(fluid,fluidAmount,em));
+        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluid,fluidAmount));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    private void addItemQuantization(EMItemQuantizationInfo aIQI){
+        getItemQuantization().put(aIQI,aIQI);
+    }
+
+    public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT){
+        addItemQuantization(new EMItemQuantizationInfo(itemStack,skipNBT,em));
+        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,itemStack));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
+        addItemQuantization(new EMItemQuantizationInfo(prefix,material,amount,skipNBT,em));
+        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,prefix,material,amount));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addOredict(IEMStack em, String name, int qty){
+        getOredictQuantization().put(OreDictionary.getOreID(name),new EMOredictQuantizationInfo(name,qty,em));
+        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,name,qty));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty){
+        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + material.mName),new EMOredictQuantizationInfo(prefix,material,qty,em));
+        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,material,qty));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty){
+        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + materialName),new EMOredictQuantizationInfo(prefix,materialName,qty,em));
+        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,materialName,qty));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
+        return fluidQuantization;
+    }
+
+    public void setFluidQuantization(Map<Integer, EMFluidQuantizationInfo> fluidQuantization) {
+        this.fluidQuantization = fluidQuantization;
+    }
+
+    public Map<EMItemQuantizationInfo, EMItemQuantizationInfo> getItemQuantization() {
+        return itemQuantization;
+    }
+
+    public void setItemQuantization(Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization) {
+        this.itemQuantization = itemQuantization;
+    }
+
+    public Map<Integer, EMOredictQuantizationInfo> getOredictQuantization() {
+        return oredictQuantization;
+    }
+
+    public void setOredictQuantization(Map<Integer, EMOredictQuantizationInfo> oredictQuantization) {
+        this.oredictQuantization = oredictQuantization;
+    }
+
+    public Map<IEMDefinition, EMFluidDequantizationInfo> getFluidDequantization() {
+        return fluidDequantization;
+    }
+
+    public void setFluidDequantization(Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization) {
+        this.fluidDequantization = fluidDequantization;
+    }
+
+    public Map<IEMDefinition, EMItemDequantizationInfo> getItemDequantization() {
+        return itemDequantization;
+    }
+
+    public void setItemDequantization(Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization) {
+        this.itemDequantization = itemDequantization;
+    }
+
+    public Map<IEMDefinition, EMOredictDequantizationInfo> getOredictDequantization() {
+        return oredictDequantization;
+    }
+
+    public void setOredictDequantization(Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
+        this.oredictDequantization = oredictDequantization;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
new file mode 100644
index 0000000000..e20b0af3b5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
@@ -0,0 +1,11 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public interface IEMExchangeInfo<IN,OUT> {
+    OUT output();//what should be given - ItemStack,FluidStack,AspectStack, (EM definitionStack->)EM instance stack - etc.
+    //This must return new Object! - if obj is immutable don't care that much (applies to defStacks)
+
+    IN input();//same as above but for input
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
deleted file mode 100644
index 0d91b57ed5..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aFluidDequantizationInfo implements iExchangeInfo<iElementalStack,FluidStack> {
-    private final iElementalStack in;
-    private final FluidStack      out;
-
-    public aFluidDequantizationInfo(iElementalStack emIn, FluidStack fluidStackOut){
-        in=emIn;
-        out=fluidStackOut;
-    }
-
-    public aFluidDequantizationInfo(iElementalStack emIn, Fluid fluid, int fluidAmount){
-        in=emIn;
-        out=new FluidStack(fluid,fluidAmount);
-    }
-
-    @Override
-    public iElementalStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public FluidStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aFluidDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
deleted file mode 100644
index 39e4ec4671..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack, iElementalStack> {
-    private final FluidStack      in;
-    private final iElementalStack out;
-
-    public aFluidQuantizationInfo(FluidStack fluidStackIn, iElementalStack emOut){
-        in=fluidStackIn;
-        out=emOut;
-    }
-
-    public aFluidQuantizationInfo(Fluid fluid, int fluidAmount, iElementalStack emOut){
-        in=new FluidStack(fluid,fluidAmount);
-        out=emOut;
-    }
-
-    @Override
-    public FluidStack input() {
-        return in.copy();
-    }
-
-    @Override
-    public iElementalStack output() {
-        return out.clone();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getFluidID();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aFluidQuantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
deleted file mode 100644
index fb71275276..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aItemDequantizationInfo implements iExchangeInfo<iElementalStack,ItemStack> {
-    private final iElementalStack in;
-    private final ItemStack       out;
-
-    public aItemDequantizationInfo(iElementalStack emIn, ItemStack itemStackOut){
-        in=emIn;
-        out=itemStackOut;
-    }
-
-    public aItemDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int amount) {
-        in = emIn;
-        out = GT_OreDictUnificator.get(prefix, material, amount);
-    }
-
-    @Override
-    public iElementalStack input() {
-        return in.clone();
-    }
-
-    @Override
-    public ItemStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aItemDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
deleted file mode 100644
index da9950a186..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aItemQuantizationInfo implements iExchangeInfo<ItemStack, iElementalStack> {
-    private final ItemStack       in;
-    private final boolean         skipNBT;
-    private final iElementalStack out;
-
-    public aItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, iElementalStack emOut) {
-        in = itemStackIn;
-        out = emOut;
-        this.skipNBT = skipNBT;
-    }
-
-    public aItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, iElementalStack emOut) {
-        in = GT_OreDictUnificator.get(prefix, material, amount);
-        out = emOut;
-        this.skipNBT = skipNBT;
-    }
-
-    @Override
-    public ItemStack input() {
-        return in.copy();
-    }
-
-    @Override
-    public iElementalStack output() {
-        return out.clone();
-    }
-
-    @Override
-    public int hashCode() {
-        return (GameRegistry.findUniqueIdentifierFor(in.getItem())+":"+in.getUnlocalizedName()+ ':' +in.getItemDamage()).hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(obj instanceof  aItemQuantizationInfo){
-            //alias
-            ItemStack stack=((aItemQuantizationInfo) obj).in;
-            if(!in.getUnlocalizedName().equals(((aItemQuantizationInfo) obj).in.getUnlocalizedName())) {
-                return false;
-            }
-
-            if(!GameRegistry.findUniqueIdentifierFor(in.getItem()).equals(
-                GameRegistry.findUniqueIdentifierFor(((aItemQuantizationInfo) obj).in.getItem()))) {
-                return false;
-            }
-
-            if(in.getItemDamage() != OreDictionary.WILDCARD_VALUE && stack.getItemDamage() != OreDictionary.WILDCARD_VALUE) {
-                if (in.getItemDamage() != stack.getItemDamage()) {
-                    return false;
-                }
-            }
-            return skipNBT || ItemStack.areItemStackTagsEqual(in, stack);
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
deleted file mode 100644
index 20f2252bd8..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aOredictDequantizationInfo implements iExchangeInfo<iElementalStack,String> {
-    private final iElementalStack in;
-    public final  String          out;
-    public final  int             amount;
-
-    public aOredictDequantizationInfo(iElementalStack emIn, String name, int qty) {
-        in = emIn;
-        out =name;
-        amount = qty;
-    }
-
-    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int qty) {
-        in = emIn;
-        out = prefix.name() + material.mName;
-        amount = qty;
-    }
-
-    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, String materialName, int qty) {
-        in = emIn;
-        out = prefix.name() + materialName;
-        amount = qty;
-    }
-
-    @Override
-    public iElementalStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public String output() {
-        return out;
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aOredictDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
deleted file mode 100644
index 252b524185..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aOredictQuantizationInfo implements iExchangeInfo<String, iElementalStack> {
-    public final  String          in;
-    public final  int             amount;
-    private final iElementalStack out;
-
-    public aOredictQuantizationInfo(String name, int qty, iElementalStack emOut){
-        in=name;
-        amount=qty;
-        out=emOut;
-    }
-
-    public aOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, iElementalStack emOut){
-        in=prefix.name() + material.mName;
-        amount=qty;
-        out=emOut;
-    }
-
-    public aOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, iElementalStack emOut){
-        in=prefix.name() + materialName;
-        amount=qty;
-        out=emOut;
-    }
-
-    @Override
-    public String input() {
-        return in;
-    }
-
-    @Override
-    public iElementalStack output() {
-        return out.clone();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aOredictQuantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
deleted file mode 100644
index 39f946c54a..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-import static java.lang.Math.pow;
-
-/**
- * Created by Tec on 26.05.2017.
- */
-public class bTransformationInfo {
-    /**
-     * Atom count per Mol
-     */
-    public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    /**
-     * Min. chance of existing
-     */
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
-    /**
-     * Quantity considered to be indifferent when computing stuff
-     */
-    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
-    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
-    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON*144D;
-    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
-    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON*1000D;
-
-    public static bTransformationInfo TRANSFORMATION_INFO = new bTransformationInfo();
-
-    public Map<Integer,aFluidQuantizationInfo> fluidQuantization;
-    public Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization;
-    public Map<Integer,aOredictQuantizationInfo> oredictQuantization;
-
-    public Map<iElementalDefinition,aFluidDequantizationInfo> fluidDequantization;
-    public Map<iElementalDefinition,aItemDequantizationInfo> itemDequantization;
-    public Map<iElementalDefinition,aOredictDequantizationInfo> oredictDequantization;
-
-    private bTransformationInfo() {
-        this(
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
-        );
-    }
-
-    public bTransformationInfo(
-            Map<Integer, aFluidQuantizationInfo> fluidQuantization,
-            Map<aItemQuantizationInfo, aItemQuantizationInfo> itemQuantization,
-            Map<Integer, aOredictQuantizationInfo> oredictQuantization,
-            Map<iElementalDefinition, aFluidDequantizationInfo> fluidDequantization,
-            Map<iElementalDefinition, aItemDequantizationInfo> itemDequantization,
-            Map<iElementalDefinition, aOredictDequantizationInfo> oredictDequantization) {
-        this.fluidQuantization = fluidQuantization;
-        this.itemQuantization = itemQuantization;
-        this.oredictQuantization = oredictQuantization;
-        this.fluidDequantization = fluidDequantization;
-        this.itemDequantization = itemDequantization;
-        this.oredictDequantization = oredictDequantization;
-    }
-
-    public void addFluid(iElementalStack em, FluidStack fluidStack){
-        fluidQuantization.put(fluidStack.getFluidID(),new aFluidQuantizationInfo(fluidStack,em));
-        fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluidStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addFluid(iElementalStack em, Fluid fluid, int fluidAmount){
-        fluidQuantization.put(fluid.getID(),new aFluidQuantizationInfo(fluid,fluidAmount,em));
-        fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluid,fluidAmount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    private void addItemQuantization(aItemQuantizationInfo aIQI){
-        itemQuantization.put(aIQI,aIQI);
-    }
-
-    public void addItem(iElementalStack em, ItemStack itemStack, boolean skipNBT){
-        addItemQuantization(new aItemQuantizationInfo(itemStack,skipNBT,em));
-        itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,itemStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addItem(iElementalStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
-        addItemQuantization(new aItemQuantizationInfo(prefix,material,amount,skipNBT,em));
-        itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,prefix,material,amount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addOredict(iElementalStack em, String name, int qty){
-        oredictQuantization.put(OreDictionary.getOreID(name),new aOredictQuantizationInfo(name,qty,em));
-        oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,name,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addOredict(iElementalStack em, OrePrefixes prefix, Materials material, int qty){
-        oredictQuantization.put(OreDictionary.getOreID(prefix.name() + material.mName),new aOredictQuantizationInfo(prefix,material,qty,em));
-        oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,material,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addOredict(iElementalStack em, OrePrefixes prefix, String materialName, int qty){
-        oredictQuantization.put(OreDictionary.getOreID(prefix.name() + materialName),new aOredictQuantizationInfo(prefix,materialName,qty,em));
-        oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,materialName,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java
deleted file mode 100644
index 2e8ef92073..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public interface iExchangeInfo<IN,OUT> {
-    OUT output();//what should be given - ItemStack,FluidStack,AspectStack, (EM definitionStack->)EM instance stack - etc.
-    //This must return new Object! - if obj is immutable don't care that much (applies to defStacks)
-
-    IN input();//same as above but for input
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
new file mode 100644
index 0000000000..77ac6c46c4
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -0,0 +1,1694 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
+
+import com.github.technus.tectech.Reference;
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition;
+import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.XSTR;
+import cpw.mods.fml.common.Loader;
+import gregtech.api.enums.Materials;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
+import static gregtech.api.enums.OrePrefixes.dust;
+
+/**
+ * Created by danie_000 on 18.11.2016.
+ */
+public final class EMAtomDefinition extends EMComplex {
+    public static final long ATOM_COMPLEXITY_LIMIT=65536L;
+    private static final byte BYTE_OFFSET=32;
+
+    private final int hash;
+    public static double refMass, refUnstableMass;
+
+    private static final byte                                   nbtType                    = (byte) 'a';
+    private static final Random                                 xstr                       = new XSTR();//NEEDS SEPARATE!
+    private static       Map<Integer, TreeSet<Integer>>         stableIsotopes             = new HashMap<>();
+    private static final Map<Integer, EMAtomDefinition>         stableAtoms                = new HashMap<>();
+    private static       Map<Integer, TreeMap<Double, Integer>> mostStableUnstableIsotopes = new HashMap<>();
+    private static final Map<Integer, EMAtomDefinition>         unstableAtoms              = new HashMap<>();
+    private static       EMDefinitionStack                      alpha,deuterium,tritium,helium_3,beryllium_8,carbon_14,neon_24,silicon_34;
+    private static final HashMap<EMAtomDefinition,Double> lifetimeOverrides = new HashMap<>();
+
+    private final EMNuclideIAEA iaea;
+
+    private static EMAtomDefinition somethingHeavy;
+    public static EMAtomDefinition getSomethingHeavy() {
+        return somethingHeavy;
+    }
+
+    private static final ArrayList<Runnable> overrides = new ArrayList<>();
+    public static void addOverride(EMAtomDefinition atom, double rawLifeTime){
+        lifetimeOverrides.put(atom,rawLifeTime);
+    }
+
+    //float-mass in eV/c^2
+    private final double mass;
+    //public final int charge;
+    private final int    charge;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    chargeLeptons;
+    private       double rawLifeTime;
+    //generation max present inside - minus if contains any anti quark
+    private final byte   type;
+
+    private final byte decayMode;//t neutron to proton+,0,f proton to neutron
+    //public final boolean stable;
+
+    private final int neutralCount;
+    private final int element;
+
+    private final boolean iaeaDefinitionExistsAndHasEnergyLevels;
+
+    private final EMConstantStackMap elementalStacks;
+
+    //stable is rawLifeTime>=10^9
+
+    public EMAtomDefinition(EMDefinitionStack... things) throws EMException {
+        this(true, new EMConstantStackMap(things));
+    }
+
+    private EMAtomDefinition(boolean check, EMDefinitionStack... things) throws EMException {
+        this(check, new EMConstantStackMap(things));
+    }
+
+    public EMAtomDefinition(EMConstantStackMap things) throws EMException {
+        this(true, things);
+    }
+
+    private EMAtomDefinition(boolean check, EMConstantStackMap things) throws EMException {
+        if (check && !canTheyBeTogether(things)) {
+            throw new EMException("Atom Definition error");
+        }
+        elementalStacks = things;
+
+        double mass = 0;
+        int cLeptons = 0;
+        int cNucleus = 0;
+        int neutralCount = 0, element = 0;
+        int type = 0;
+        boolean containsAnti = false;
+        for (EMDefinitionStack stack : elementalStacks.valuesToArray()) {
+            IEMDefinition def    = stack.getDefinition();
+            int           amount = (int) stack.getAmount();
+            if((int) stack.getAmount() != stack.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            mass += stack.getMass();
+            if (def.getType() < 0) {
+                containsAnti = true;
+            }
+            type = Math.max(type, Math.abs(def.getType()));
+
+            if (def instanceof EMLeptonDefinition) {
+                cLeptons += stack.getCharge();
+            } else {
+                cNucleus += stack.getCharge();
+                if (def.getCharge() == 3) {
+                    element += amount;
+                } else if (def.getCharge() == -3) {
+                    element -= amount;
+                } else if (def.getCharge() == 0) {
+                    neutralCount += amount;
+                }
+            }
+        }
+        this.type = containsAnti ? (byte) -type : (byte) type;
+        //this.mass = mass;
+        chargeLeptons = cLeptons;
+        charge = cNucleus + cLeptons;
+        this.neutralCount = neutralCount;
+        this.element = element;
+
+        element = Math.abs(element);
+
+        //stability curve
+        int StableIsotope = stableIzoCurve(element);
+        int izoDiff = neutralCount - StableIsotope;
+        int izoDiffAbs = Math.abs(izoDiff);
+
+        xstr.setSeed((element + 1L) * (neutralCount + 100L));
+        iaea = EMNuclideIAEA.get(element,neutralCount);
+        if(getIaea() !=null){
+            if(Double.isNaN(getIaea().getMass())) {
+                this.mass = mass;
+            } else {
+                this.mass = getIaea().getMass();
+            }
+
+            if(Double.isNaN(getIaea().getHalfTime())) {
+                Double overriddenLifeTime= lifetimeOverrides.get(this);
+                double rawLifeTimeTemp;
+                if(overriddenLifeTime!=null) {
+                    rawLifeTimeTemp = overriddenLifeTime;
+                } else {
+                    rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
+                }
+                rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
+            }else {
+                rawLifeTime = containsAnti ? getIaea().getHalfTime() * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) : getIaea().getHalfTime();
+            }
+            iaeaDefinitionExistsAndHasEnergyLevels = getIaea().getEnergeticStatesArray().length>1;
+        }else{
+            this.mass=mass;
+
+            Double overriddenLifeTime= lifetimeOverrides.get(this);
+            double rawLifeTimeTemp;
+            if(overriddenLifeTime!=null) {
+                rawLifeTimeTemp = overriddenLifeTime;
+            } else {
+                rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
+            }
+            rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
+
+            iaeaDefinitionExistsAndHasEnergyLevels =false;
+        }
+
+        if(getIaea() ==null || getIaea().getEnergeticStatesArray()[0].energy!=0) {
+            if (izoDiff == 0) {
+                decayMode = 0;
+            } else {
+                decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4);
+            }
+        }else{
+            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4)+ BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
+        }
+        //this.stable = this.rawLifeTime >= STABLE_RAW_LIFE_TIME;
+        hash=super.hashCode();
+    }
+
+    private static int stableIzoCurve(int element) {
+        return (int) Math.round(-1.19561E-06D * Math.pow(element, 4D) +
+                1.60885E-04D * Math.pow(element, 3D) +
+                3.76604E-04D * Math.pow(element, 2D) +
+                1.08418E+00D * (double) element);
+    }
+
+    private static double calculateLifeTime(int izoDiff, int izoDiffAbs, int element, int isotope, boolean containsAnti) {
+        double rawLifeTime;
+
+        if (element <= 83 && isotope < 127 && (izoDiffAbs == 0 || element == 1 && isotope == 0 || element == 2 && isotope == 1 || izoDiffAbs == 1 && element > 2 && element % 2 == 1 || izoDiffAbs == 3 && element > 30 && element % 2 == 0 || izoDiffAbs == 5 && element > 30 && element % 2 == 0 || izoDiffAbs == 2 && element > 20 && element % 2 == 1)) {
+            rawLifeTime = (1D + xstr.nextDouble() * 9D) * (containsAnti ? 2.381e4D : 1.5347e25D);
+        } else {
+            //Y = (X-A)/(B-A) * (D-C) + C
+            double unstabilityEXP;
+            if (element == 0) {
+                return 1e-35D;
+            } else if (element == 1) {
+                unstabilityEXP = 1.743D - Math.abs(izoDiff - 1) * 9.743D;
+            } else if (element == 2) {
+                switch (isotope) {
+                    case 4:
+                        unstabilityEXP = 1.61D;
+                        break;
+                    case 5:
+                        unstabilityEXP = -7.523D;
+                        break;
+                    case 6:
+                        unstabilityEXP = -1.51D;
+                        break;
+                    default:
+                        unstabilityEXP = -(izoDiffAbs * 6.165D);
+                        break;
+                }
+            } else if (element <= 83 || isotope <= 127 && element <= 120) {
+                double elementPow4 = Math.pow(element, 4);
+
+                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - Math.abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
+            } else if (element < 180) {
+                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - Math.abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
+            } else {
+                return -1;
+            }
+            if ((isotope == 127 || isotope == 128) && element < 120 && element > 83) {
+                unstabilityEXP -= 1.8D;
+            }
+            if (element > 83 && element < 93 && isotope % 2 == 0 && izoDiff == 3) {
+                unstabilityEXP += 6;
+            }
+            if (element > 93 && element < 103 && isotope % 2 == 0 && izoDiff == 4) {
+                unstabilityEXP += 6;
+            }
+            rawLifeTime = (containsAnti ? 1e-8D : 1) * Math.pow(10D, unstabilityEXP) * (1D + xstr.nextDouble() * 9D);
+        }
+
+        if (rawLifeTime < 8e-15D) {
+            return 1e-35D;
+        }
+        if (rawLifeTime > 8e28D) {
+            return 8e30D;
+        }
+        return rawLifeTime;
+    }
+
+    private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
+        boolean nuclei = false;
+        long qty=0;
+        for (EMDefinitionStack stack : stacks.valuesToArray()) {
+            if (stack.getDefinition() instanceof EMHadronDefinition) {
+                if (((EMHadronDefinition) stack.getDefinition()).getAmount() != 3) {
+                    return false;
+                }
+                nuclei = true;
+            } else if (!(stack.getDefinition() instanceof EMLeptonDefinition)) {
+                return false;
+            }
+            if((int) stack.getAmount() != stack.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            qty+= stack.getAmount();
+        }
+        return nuclei && qty<ATOM_COMPLEXITY_LIMIT;
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    public int getChargeLeptons() {
+        return chargeLeptons;
+    }
+
+    public int getChargeHadrons() {
+        return getCharge() - getChargeLeptons();
+    }
+
+    public int getIonizationElementWise() {
+        return getElement() * 3 + getChargeLeptons();
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public byte getType() {
+        return type;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        if(currentEnergy<=0) {
+            return rawLifeTime;
+        }
+        if(iaeaDefinitionExistsAndHasEnergyLevels){
+            if(currentEnergy>= getIaea().getEnergeticStatesArray().length){
+                return getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].Thalf/(currentEnergy- getIaea().getEnergeticStatesArray().length+1);
+            }
+            return getIaea().getEnergeticStatesArray()[(int)currentEnergy].Thalf;
+        }
+        return rawLifeTime/(currentEnergy+1);
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+
+    @Override
+    public byte getColor() {
+        return -10;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        int element = Math.abs(this.getElement());
+        boolean negative = this.getElement() < 0;
+        try {
+            if (Math.abs(getType()) != 1) {
+                return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
+            }
+            return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return (negative ? "Element: ~" : "Element: ") + element;
+        }
+    }
+
+    @Override
+    public String getSymbol() {
+        int element = Math.abs(this.getElement());
+        boolean negative = this.getElement() < 0;
+        try {
+            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            try {
+                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
+                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+            } catch (Exception E) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+            }
+        }
+    }
+
+    @Override
+    public String getShortSymbol() {
+        int element = Math.abs(this.getElement());
+        boolean negative = this.getElement() < 0;
+        try {
+            return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            try {
+                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
+                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1];
+            } catch (Exception E) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return (negative ? "~" : "") + "?";
+            }
+        }
+    }
+
+    @Override
+    public EMConstantStackMap getSubParticles() {
+        return elementalStacks.clone();
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        ArrayList<EMDecay> decaysList =new ArrayList<>(4);
+        return getDecayArray(decaysList, getDecayMode(),true);
+    }
+
+    private EMDecay[] getDecayArray(ArrayList<EMDecay> decaysList, int decayMode, boolean tryAnti) {//todo?
+        if (getType() == 1) {
+            switch (decayMode) {
+                case -2:
+                    if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    } else if(PbetaDecay(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case -1:
+                    if(Emmision(decaysList, EMHadronDefinition.hadron_p1)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case 0:
+                    if(alphaDecay(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case 1:
+                    if(Emmision(decaysList, EMHadronDefinition.hadron_n1)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case 2:
+                    if(MbetaDecay(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                default:
+                    if(decayMode>8){
+                        if(iaeaDecay(decaysList,0)) {
+                            return decaysList.toArray(EMDecay.NO_PRODUCT);
+                        }
+                        return getDecayArray(decaysList,decayMode- BYTE_OFFSET,false);
+                    }
+            }
+            return EMDecay.NO_DECAY;
+        }else if(getType() ==-1){
+            EMAtomDefinition anti =getAnti();
+            if(anti!=null) {
+                return anti.getDecayArray(decaysList, decayMode, false);
+            }
+        }
+        return getNaturalDecayInstant();
+    }
+
+    private boolean iaeaDecay(ArrayList<EMDecay> decaysList, long energy){
+        EMNuclideIAEA.energeticState state;
+        if(energy> getIaea().getEnergeticStatesArray().length) {
+            state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
+        } else if(energy<=0) {
+            state = getIaea().getEnergeticStatesArray()[0];
+        } else {
+            state = getIaea().getEnergeticStatesArray()[(int) energy];
+        }
+        for (int i=0;i<state.decaymodes.length;i++){
+            if(!getDecayFromIaea(decaysList,state.decaymodes[i],energy)) {
+                decaysList.clear();
+                return false;
+            }
+        }
+        return !decaysList.isEmpty();
+    }
+
+    private boolean getDecayFromIaea(ArrayList<EMDecay> decaysList, EMNuclideIAEA.iaeaDecay decay, long energy){
+        EMDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new EMDefinitionStackMap();
+        switch (decay.decayName){
+            case "D": {
+                if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())){
+                    withThis.putReplace(deuterium);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "3H": {
+                if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())){
+                    withThis.putReplace(tritium);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "3HE": {
+                if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())){
+                    withThis.putReplace(helium_3);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "8BE": {
+                if (withThis.removeAllAmountsExact(beryllium_8.getDefinition().getSubParticles())){
+                    withThis.putReplace(beryllium_8);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "14C": {
+                if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())){
+                    newStuff.putReplace(carbon_14);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "24NE": {
+                if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())){
+                    newStuff.putReplace(neon_24);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "34SI": {
+                if (withThis.removeAllAmountsExact(silicon_34.getDefinition().getSubParticles())){
+                    newStuff.putReplace(silicon_34);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "A": case "A?": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)){
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_2);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2B-": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e2);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "EC": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2EC": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B++EC": case "EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+A": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+2P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-A": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_n1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-2N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_n2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECA": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECP": {
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "EC2P": {
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECP+EC2P": {//todo look at branching ratios
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p3);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_n1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_n2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_p2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "SF": {
+                if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
+                    return true;
+                }
+            } break;
+            case "B-F": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECF": case "ECSF": case "EC(+SF)": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "SF(+EC+B+)": case "SF+EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "SF+EC+B-": {
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "IT": case "IT?": case "G": {
+                if(energy>0){
+                    decaysList.add(new EMDecay(decay.chance, this, boson_Y__));
+                }else{
+                    if(DEBUG_MODE) {
+                        TecTech.LOGGER.info("Tried to emit Gamma from ground state");
+                    }
+                    decaysList.add(new EMDecay(decay.chance, this));
+                }
+                return true;
+            } //break;
+            case "IT+EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    newStuff.putReplace(EMBosonDefinition.boson_Y__1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "DEAD_END":
+                decaysList.add(deadEnd);
+                return true;
+            default: throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + getNeutralCount() + ' ' + getElement());
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Failed to decay " + getElement() + ' ' + getNeutralCount() + ' ' + decay.decayName);
+        }
+        return false;
+    }
+
+    private boolean Emmision(ArrayList<EMDecay> decaysList, EMDefinitionStack emit) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAmountExact(emit)) {
+            try {
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), emit));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean alphaDecay(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAllAmountsExact(alpha.getDefinition().getSubParticles())) {
+            try {
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), alpha));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean MbetaDecay(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAmountExact(EMHadronDefinition.hadron_n1)) {
+            try {
+                tree.putUnifyExact(EMHadronDefinition.hadron_p1);
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), EMLeptonDefinition.lepton_e1, EMNeutrinoDefinition.lepton_Ve_1));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean PbetaDecay(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAmountExact(EMHadronDefinition.hadron_p1)) {
+            try {
+                tree.putUnifyExact(EMHadronDefinition.hadron_n1);
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), EMLeptonDefinition.lepton_e_1, EMNeutrinoDefinition.lepton_Ve1));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean ElectronCapture(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) {
+            try {
+                tree.putUnifyExact(EMHadronDefinition.hadron_n1);
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), EMNeutrinoDefinition.lepton_Ve1));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean Fission(ArrayList<EMDecay> decaysList, EMDefinitionStackMap fissile, EMDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
+        EMDefinitionStackMap heavy      = new EMDefinitionStackMap();
+        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement())<=97);
+
+        for(EMDefinitionStack stack: fissile.valuesToArray()){
+            if(spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
+                    (stack.getAmount() <=80 || stack.getAmount() <90 && XSTR_INSTANCE.nextInt(10)< stack.getAmount() -80)) {
+                return false;
+            }
+            if(stack.getDefinition().getCharge()==0){
+                //if(stack.definition instanceof dHadronDefinition){
+                    double neutrals= stack.getAmount() *liquidDrop[2];
+                    int neutrals_cnt=(int)Math.floor(neutrals);
+                    neutrals_cnt+=neutrals-neutrals_cnt>XSTR_INSTANCE.nextDouble()?1:0;
+                    particles.putUnifyExact(new EMDefinitionStack(stack.getDefinition(), neutrals_cnt));
+
+                    int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[1]);
+                    while(heavy_cnt+neutrals_cnt> stack.getAmount()) {
+                        heavy_cnt--;
+                    }
+                    fissile.removeAmountExact(new EMDefinitionStack(stack.getDefinition(),heavy_cnt+neutrals_cnt));
+                    heavy.putReplace(new EMDefinitionStack(stack.getDefinition(), heavy_cnt));
+                //}else{
+                //    particles.add(stack);
+                //    light.remove(stack.definition);
+                //}
+            }else{
+                int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[0]);
+                if(heavy_cnt%2==1 && XSTR_INSTANCE.nextDouble()>0.05D) {
+                    heavy_cnt--;
+                }
+                EMDefinitionStack new_stack =new EMDefinitionStack(stack.getDefinition(), heavy_cnt);
+                fissile.removeAmountExact(new_stack);
+                heavy.putReplace(new_stack);
+            }
+        }
+
+        try {
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            decaysList.add(new EMDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+            return true;
+        } catch (Exception e) {
+            if(DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+
+    private static double[] liquidDropFunction(boolean asymmetric) {
+        double[] out = new double[3];
+
+        out[0] = XSTR_INSTANCE.nextGaussian();
+
+        if (out[0] < 1 && out[0] >= -1) {
+            if (XSTR_INSTANCE.nextBoolean()) {
+                out[0] = XSTR_INSTANCE.nextDouble() * 2d - 1d;
+            }
+        }
+
+        if (asymmetric && out[0] > XSTR_INSTANCE.nextDouble() && XSTR_INSTANCE.nextInt(4) == 0) {
+            out[0] = -out[0];
+        }
+
+        //scale to splitting ratio
+        out[0] = out[0] * 0.05d + .6d;
+
+        if (out[0] < 0 || out[0] > 1) {
+            return liquidDropFunction(asymmetric);
+        }
+        if (out[0] < .5d) {
+            out[0] = 1d - out[0];
+        }
+
+        //extra neutrals
+        out[2] = 0.012d + XSTR_INSTANCE.nextDouble() * 0.01d;
+
+        if (asymmetric) {
+            out[1] = out[0];
+        } else {
+            out[1] = out[0] - out[2] * .5d;
+        }
+
+        return out;
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        if (iaeaDefinitionExistsAndHasEnergyLevels) {
+            ArrayList<EMDecay> decays =new ArrayList<>(4);
+            if(iaeaDecay(decays,energyLevel)){
+                return decays.toArray(EMDecay.NO_PRODUCT);
+            }
+        }
+        if(energyLevel< Math.abs(getCharge())/3+ getNeutralCount()) {
+            return new EMDecay[]{new EMDecay(1, this, boson_Y__)};
+        }
+        return getNaturalDecayInstant();
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel,long newEnergyLevel) {
+        if(iaeaDefinitionExistsAndHasEnergyLevels){
+            double result=0;
+            boolean backwards=newEnergyLevel<currentEnergyLevel;
+            if(backwards){
+                long temp=currentEnergyLevel;
+                currentEnergyLevel=newEnergyLevel;
+                newEnergyLevel=temp;
+            }
+
+            if(currentEnergyLevel<=0){
+                if(newEnergyLevel<=0) {
+                    return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
+                } else {
+                    result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * -currentEnergyLevel;
+                }
+            }else {
+                result -= getIaea().getEnergeticStatesArray()[(int) Math.min(getIaea().getEnergeticStatesArray().length - 1, currentEnergyLevel)].energy;
+            }
+            if(newEnergyLevel>= getIaea().getEnergeticStatesArray().length){
+                if(currentEnergyLevel>= getIaea().getEnergeticStatesArray().length) {
+                    return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
+                } else {
+                    result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - getIaea().getEnergeticStatesArray().length + 1);
+                }
+                result+= getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].energy;
+            }else {
+                result += getIaea().getEnergeticStatesArray()[(int) newEnergyLevel].energy;
+            }
+
+            return backwards?-result:result;
+        }
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return iaeaDefinitionExistsAndHasEnergyLevels;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        if(!iaeaDefinitionExistsAndHasEnergyLevels) return false;
+        EMNuclideIAEA.energeticState state;
+        if(energyLevel> getIaea().getEnergeticStatesArray().length) {
+            state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
+        } else if(energyLevel<=0) {
+            state = getIaea().getEnergeticStatesArray()[0];
+        } else {
+            state = getIaea().getEnergeticStatesArray()[(int) energyLevel];
+        }
+        for (EMNuclideIAEA.iaeaDecay decay:state.decaymodes){
+            if(decay.decayName.contains("F")) return true;//if is fissile
+        }
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return iaeaDefinitionExistsAndHasEnergyLevels;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return getIaea() !=null || iaeaDefinitionExistsAndHasEnergyLevels;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        //disembody
+        ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
+        for (EMDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
+            if (elementalStack.getDefinition().getType() == 1 || elementalStack.getDefinition().getType() == -1) {
+                //covers both quarks and antiquarks
+                decaysInto.add(elementalStack);
+            } else {
+                //covers both quarks and antiquarks
+                decaysInto.add(new EMDefinitionStack(boson_Y__, 2));
+            }
+        }
+        return new EMDecay[]{new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])), deadEnd};
+    }
+
+    //@Override
+    //public iElementalDefinition getAnti() {
+    //    cElementalDefinitionStack[] stacks = this.elementalStacks.values();
+    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
+    //    for (int i = 0; i < antiElements.length; i++) {
+    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
+    //    }
+    //    try {
+    //        return new dAtomDefinition(false, antiElements);
+    //    } catch (tElementalException e) {
+    //        if (DEBUG_MODE) e.printStackTrace();
+    //        return null;
+    //    }
+    //}
+
+    @Override
+    public EMAtomDefinition getAnti() {
+        EMDefinitionStackMap anti = new EMDefinitionStackMap();
+        for (EMDefinitionStack stack : elementalStacks.valuesToArray()) {
+            anti.putReplace(new EMDefinitionStack(stack.getDefinition().getAnti(), stack.getAmount()));
+        }
+        try {
+            return new EMAtomDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return EMTransformationInfo.TRANSFORMATION_INFO.getFluidDequantization().get(this);
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return EMTransformationInfo.TRANSFORMATION_INFO.getItemDequantization().get(this);
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return EMTransformationInfo.TRANSFORMATION_INFO.getOredictDequantization().get(this);
+    }
+
+    public EMNuclideIAEA getIaea() {
+        return iaea;
+    }
+
+    public byte getDecayMode() {
+        return decayMode;
+    }
+
+    public int getNeutralCount() {
+        return neutralCount;
+    }
+
+    public int getElement() {
+        return element;
+    }
+
+    private static final class Nomenclature {
+        private static final String[] SYMBOL = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
+        private static final String[] NAME = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+        private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
+    }
+
+    @Override
+    public NBTTagCompound toNBT() {
+        return getNbtTagCompound(nbtType, elementalStacks);
+    }
+
+    public static EMAtomDefinition fromNBT(NBTTagCompound nbt) {
+        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < stacks.length; i++) {
+            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+        }
+        try {
+            return new EMAtomDefinition(stacks);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    public static void run() {
+        for (Runnable r : overrides) {
+            r.run();
+        }
+
+        for(Map.Entry<EMAtomDefinition,Double> entry:lifetimeOverrides.entrySet()){
+            try {
+                lifetimeOverrides.put(new EMAtomDefinition(entry.getKey().elementalStacks), entry.getValue());
+            }catch (EMException e){
+                e.printStackTrace(); //Impossible
+            }
+        }
+
+        //populate stable isotopes
+        for (int element = 1; element < 83; element++)//Up to Bismuth exclusive
+        {
+            for (int isotope = 0; isotope < 130; isotope++) {
+                xstr.setSeed((long) (element + 1) * (isotope + 100));
+                //stability curve
+                int StableIsotope = stableIzoCurve(element);
+                int izoDiff = isotope - StableIsotope;
+                int izoDiffAbs = Math.abs(izoDiff);
+                double        rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                EMNuclideIAEA nuclide     = EMNuclideIAEA.get(element, isotope);
+                if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.getHalfTime() >= STABLE_RAW_LIFE_TIME) {
+                    TreeSet<Integer> isotopes = stableIsotopes.computeIfAbsent(element, k -> new TreeSet<>());
+                    isotopes.add(isotope);
+                }
+            }
+        }
+
+        //populate unstable isotopes
+        for (int element = 83; element < 150; element++) {
+            for (int isotope = 100; isotope < 180; isotope++) {
+                xstr.setSeed((long) (element + 1) * (isotope + 100));
+                //stability curve
+                int Isotope = stableIzoCurve(element);
+                int izoDiff = isotope - Isotope;
+                int izoDiffAbs = Math.abs(izoDiff);
+                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                TreeMap<Double, Integer> isotopes = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
+                isotopes.put(rawLifeTime, isotope);
+            }
+        }
+
+        try {
+            for (Map.Entry<Integer, TreeSet<Integer>> integerTreeSetEntry : stableIsotopes.entrySet()) {
+                stableAtoms.put(integerTreeSetEntry.getKey(), new EMAtomDefinition(
+                        new EMDefinitionStack(EMHadronDefinition.hadron_p, integerTreeSetEntry.getKey()),
+                        new EMDefinitionStack(EMHadronDefinition.hadron_n, integerTreeSetEntry.getValue().first()),
+                        new EMDefinitionStack(EMLeptonDefinition.lepton_e, integerTreeSetEntry.getKey())));
+                if (DEBUG_MODE) {
+                    TecTech.LOGGER.info("Added Stable Atom:" + integerTreeSetEntry.getKey() + ' ' + integerTreeSetEntry.getValue().first() + ' ' + stableAtoms.get(integerTreeSetEntry.getKey()).getMass());
+                }
+            }
+            for (Map.Entry<Integer, TreeMap<Double, Integer>> integerTreeMapEntry : mostStableUnstableIsotopes.entrySet()) {
+                unstableAtoms.put(integerTreeMapEntry.getKey(), new EMAtomDefinition(
+                        new EMDefinitionStack(EMHadronDefinition.hadron_p, integerTreeMapEntry.getKey()),
+                        new EMDefinitionStack(EMHadronDefinition.hadron_n, integerTreeMapEntry.getValue().lastEntry().getValue()),
+                        new EMDefinitionStack(EMLeptonDefinition.lepton_e, integerTreeMapEntry.getKey())));
+                if (DEBUG_MODE) {
+                    TecTech.LOGGER.info("Added Unstable Atom:" + integerTreeMapEntry.getKey() + ' ' + integerTreeMapEntry.getValue().lastEntry().getValue() + ' ' + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass());
+                }
+            }
+            deuterium=new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p1,
+                    EMHadronDefinition.hadron_n1,
+                    EMLeptonDefinition.lepton_e1).getStackForm(1);
+            tritium=new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p1,
+                    EMHadronDefinition.hadron_n2,
+                    EMLeptonDefinition.lepton_e1).getStackForm(1);
+            helium_3=new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p2,
+                    EMHadronDefinition.hadron_n1,
+                    EMLeptonDefinition.lepton_e2).getStackForm(1);
+            alpha = new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p2,
+                    EMHadronDefinition.hadron_n2).getStackForm(1);
+            beryllium_8=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 4),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 4),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 4)).getStackForm(1);
+            carbon_14=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 6),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 8),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 6)).getStackForm(1);
+            neon_24=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 10),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 14),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 10)).getStackForm(1);
+            silicon_34=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 14),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 20),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 14)).getStackForm(1);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMAtomDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)64);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + 64);
+        }
+    }
+
+    public static void setTransformation(){
+        /*----STABLE ATOMS----**/
+        refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
+
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
+        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
+        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
+
+        /*----UNSTABLE ATOMS----**/
+        refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
+
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
+        //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
+        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
+        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
+
+        try {
+            EMAtomDefinition temp;
+            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(deuterium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
+
+            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(tritium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
+
+            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(helium_3.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
+
+            temp=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
+
+            double tempMass=temp.getMass();
+
+            temp=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
+
+            TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
+
+            temp=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
+
+            somethingHeavy=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
+
+            TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
+
+            TecTech.LOGGER.info("Neutron Mass: "+ EMHadronDefinition.hadron_n.getMass());
+
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+
+        if(Loader.isModLoaded(Reference.GTPLUSPLUS)) {
+            new GtppAtomLoader().run();
+        }
+    }
+
+    public static EMAtomDefinition getFirstStableIsotope(int element) {
+        return stableAtoms.get(element);
+    }
+
+    public static EMAtomDefinition getBestUnstableIsotope(int element) {
+        return unstableAtoms.get(element);
+    }
+
+    @Override
+    public byte getClassType() {
+        return 64;
+    }
+
+    public static byte getClassTypeStatic(){
+        return 64;
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+        }
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+ getLocalizedName());
+            lines.add("SYMBOL = "+getSymbol());
+        }
+        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){
+            for(int i = 1; i< getIaea().getEnergeticStatesArray().length; i++){
+                lines.add("E LEVEL "+i+" = "+ getIaea().getEnergeticStatesArray()[i].energy+" eV");
+            }
+        }
+        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    At current energy level");
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
new file mode 100644
index 0000000000..384087770f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -0,0 +1,520 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.*;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
+import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
+import com.github.technus.tectech.util.Util;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static gregtech.api.enums.OrePrefixes.dust;
+
+/**
+ * Created by danie_000 on 17.11.2016.
+ */
+public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
+    private final int hash;
+
+    private static final byte                           nbtType    = (byte) 'h';
+    //Helpers
+    public static final  Map<EMHadronDefinition,String> SYMBOL_MAP =new HashMap<>();
+    public static final  Map<EMHadronDefinition,String> NAME_MAP   =new HashMap<>();
+    public static        EMHadronDefinition             hadron_p, hadron_n, hadron_p_, hadron_n_;
+    public static EMDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3, hadron_p5;
+    private static double protonMass = 0D;
+    private static double neutronMass = 0D;
+    private static final double actualProtonMass=938272081.3D;
+    private static final double actualNeutronMass=939565413.3D;
+
+    //float-mass in eV/c^2
+    private final double mass;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    charge;
+    private final double rawLifeTime;
+    private final int    amount;
+    //generation max present inside - minus if contains any antiquark
+    private final byte   type;
+    //private final FluidStack fluidThing;
+    //private final ItemStack itemThing;
+
+    private final EMConstantStackMap quarkStacks;
+
+    public EMHadronDefinition(EMDefinitionStack... quarks) throws EMException {
+        this(true, new EMConstantStackMap(quarks));
+    }
+
+    private EMHadronDefinition(boolean check, EMDefinitionStack... quarks) throws EMException {
+        this(check, new EMConstantStackMap(quarks));
+    }
+
+    public EMHadronDefinition(EMConstantStackMap quarks) throws EMException {
+        this(true, quarks);
+    }
+
+    private EMHadronDefinition(boolean check, EMConstantStackMap quarks) throws EMException {
+        if (check && !canTheyBeTogether(quarks)) {
+            throw new EMException("Hadron Definition error");
+        }
+        quarkStacks = quarks;
+
+        int amount = 0;
+        int charge = 0;
+        int type = 0;
+        boolean containsAnti = false;
+        double mass = 0;
+        for (EMDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
+            amount += quarkStack.getAmount();
+            if((int) quarkStack.getAmount() != quarkStack.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            mass += quarkStack.getMass();
+            charge += quarkStack.getCharge();
+            type = Math.max(Math.abs(quarkStack.getDefinition().getType()), type);
+            if (quarkStack.getDefinition().getType() < 0) {
+                containsAnti = true;
+            }
+        }
+        this.amount = amount;
+        this.charge = charge;
+        this.type = containsAnti ? (byte) -type : (byte) type;
+        long mult = this.getAmount() * this.getAmount() * (this.getAmount() - 1);
+        mass = mass * 5.543D * mult;//yes it becomes heavier
+
+        if (mass == protonMass && this.getAmount() == 3) {
+            rawLifeTime = IEMDefinition.STABLE_RAW_LIFE_TIME;
+            mass=actualProtonMass;
+        } else if (mass == neutronMass && this.getAmount() == 3) {
+            rawLifeTime = 882D;
+            mass=actualNeutronMass;
+        } else {
+            if (this.getAmount() == 3) {
+                rawLifeTime = 1.34D / mass * Math.pow(9.81, charge);
+            } else if (this.getAmount() == 2) {
+                rawLifeTime = 1.21D / mass / Math.pow(19.80, charge);
+            } else {
+                rawLifeTime = 1.21D / mass / Math.pow(9.80, charge);
+            }
+        }
+        this.mass=mass;
+        hash=super.hashCode();
+    }
+
+    //public but u can just try{}catch(){} the constructor it still calls this method
+    private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
+        long amount = 0;
+        for (EMDefinitionStack quarks : stacks.valuesToArray()) {
+            if (!(quarks.getDefinition() instanceof EMQuarkDefinition)) {
+                return false;
+            }
+            if((int) quarks.getAmount() != quarks.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            amount += quarks.getAmount();
+        }
+        return amount >= 2 && amount <= 12;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        StringBuilder name= new StringBuilder(getSimpleName());
+        name.append(':');
+        String sym= NAME_MAP.get(this);
+        if(sym!=null){
+            name.append(' ').append(sym);
+        }else {
+            for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
+                name.append(' ').append(quark.getDefinition().getSymbol()).append((int) quark.getAmount());
+            }
+        }
+        return name.toString();
+    }
+
+    private String getSimpleName() {
+        switch (getAmount()) {
+            case 2:
+                return "Meson";
+            case 3:
+                return "Baryon";
+            case 4:
+                return "Tetraquark";
+            case 5:
+                return "Pentaquark";
+            case 6:
+                return "Hexaquark";
+            default:
+                return "Hadron";
+        }
+    }
+
+    @Override
+    public String getSymbol() {
+        String sym=SYMBOL_MAP.get(this);
+        if(sym!=null){
+            return sym;
+        }else {
+            StringBuilder symbol = new StringBuilder(8);
+            for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
+                for (int i = 0; i < quark.getAmount(); i++) {
+                    symbol.append(quark.getDefinition().getSymbol());
+                }
+            }
+            return symbol.toString();
+        }
+    }
+
+    @Override
+    public String getShortSymbol() {
+        String sym=SYMBOL_MAP.get(this);
+        if(sym!=null){
+            return sym;
+        }else {
+            StringBuilder symbol = new StringBuilder(8);
+            for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
+                for (int i = 0; i < quark.getAmount(); i++) {
+                    symbol.append(quark.getDefinition().getShortSymbol());
+                }
+            }
+            return symbol.toString();
+        }
+    }
+
+    @Override
+    public byte getColor() {
+        return -7;
+    }
+
+    @Override
+    public EMConstantStackMap getSubParticles() {
+        return quarkStacks;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+            return EMDecay.NO_PRODUCT;
+        }
+        ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
+        for (EMDefinitionStack quarks : quarkStacks) {
+            if (quarks.getDefinition().getType() == 1 || quarks.getDefinition().getType() == -1) {
+                //covers both quarks and antiquarks
+                decaysInto.add(quarks);
+            } else {
+                //covers both quarks and antiquarks
+                decaysInto.add(new EMDefinitionStack(boson_Y__, 2));
+            }
+        }
+        return new EMDecay[]{
+                new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])),
+                EMBosonDefinition.deadEnd
+        };
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{new EMDecay(0.75D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
+        if (getAmount() == 2 && quarkStacks.length == 2 &&
+                quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() &&
+                quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+            return EMDecay.NO_PRODUCT;
+        } else if (getAmount() != 3) {
+            return new EMDecay[]{new EMDecay(0.95D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+        } else {
+            ArrayList<EMQuarkDefinition> newBaryon = new ArrayList<>();
+            IEMDefinition[]              Particles = new IEMDefinition[2];
+            for (EMDefinitionStack quarks : quarkStacks) {
+                for (int i = 0; i < quarks.getAmount(); i++) {
+                    newBaryon.add((EMQuarkDefinition) quarks.getDefinition());
+                }
+            }
+            //remove last
+            EMQuarkDefinition lastQuark = newBaryon.remove(2);
+
+            EMDefinitionStack[] decay;
+            if (Math.abs(lastQuark.getType()) > 1) {
+                decay = lastQuark.getDecayArray()[1].getOutputStacks().valuesToArray();
+            } else {
+                decay = lastQuark.getDecayArray()[2].getOutputStacks().valuesToArray();
+            }
+            newBaryon.add((EMQuarkDefinition) decay[0].getDefinition());
+            Particles[0] = decay[1].getDefinition();
+            Particles[1] = decay[2].getDefinition();
+
+            EMDefinitionStack[] contentOfBaryon = newBaryon.stream()
+                    .map(eQuarkDefinition -> new EMDefinitionStack(eQuarkDefinition,1))
+                    .toArray(EMDefinitionStack[]::new);
+
+            try {
+                return new EMDecay[]{
+                        new EMDecay(0.001D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__),
+                        new EMDecay(0.99D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
+                        EMBosonDefinition.deadEnd};
+            } catch (EMException e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return new EMDecay[]{EMBosonDefinition.deadEnd};
+            }
+        }
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return getRawLifeTime();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+
+    @Override
+    public byte getType() {
+        return type;
+    }
+
+    //@Override
+    //public iElementalDefinition getAnti() {
+    //    cElementalDefinitionStack[] stacks = this.quarkStacks.values();
+    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
+    //    for (int i = 0; i < antiElements.length; i++) {
+    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
+    //    }
+    //    try {
+    //        return new dHadronDefinition(false, antiElements);
+    //    } catch (tElementalException e) {
+    //        if (DEBUG_MODE) e.printStackTrace();
+    //        return null;
+    //    }
+    //}
+
+    @Override
+    public IEMDefinition getAnti() {
+        EMDefinitionStackMap anti = new EMDefinitionStackMap();
+        for (EMDefinitionStack stack : quarkStacks.valuesToArray()) {
+            anti.putReplace(new EMDefinitionStack(stack.getDefinition().getAnti(), stack.getAmount()));
+        }
+        try {
+            return new EMHadronDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public NBTTagCompound toNBT() {
+        return getNbtTagCompound(nbtType, quarkStacks);
+    }
+
+    public static EMHadronDefinition fromNBT(NBTTagCompound nbt) {
+        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < stacks.length; i++) {
+            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+        }
+        try {
+            return new EMHadronDefinition(stacks);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    public static void run() {
+        try {
+            hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
+            protonMass = hadron_p.getMass();
+            //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
+            hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
+            SYMBOL_MAP.put(hadron_p,"p");
+            NAME_MAP.put(hadron_p,"Proton");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
+            hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
+            SYMBOL_MAP.put(hadron_p_,"~p");
+            NAME_MAP.put(hadron_p_,"Anti Proton");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
+            hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
+            neutronMass = hadron_n.getMass();
+            //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
+            hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
+            SYMBOL_MAP.put(hadron_n, "n");
+            NAME_MAP.put(hadron_n, "Neutron");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
+            hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
+            SYMBOL_MAP.put(hadron_n_,"~n");
+            NAME_MAP.put(hadron_n_,"Anti Neutron");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n_);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            protonMass = -1;
+            neutronMass = -1;
+        }
+        hadron_p1 = new EMDefinitionStack(hadron_p, 1D);
+        hadron_n1 = new EMDefinitionStack(hadron_n, 1D);
+        hadron_p2 = new EMDefinitionStack(hadron_p, 2D);
+        hadron_n2 = new EMDefinitionStack(hadron_n, 2D);
+        hadron_p3 = new EMDefinitionStack(hadron_p, 3D);
+        hadron_n3 = new EMDefinitionStack(hadron_n, 3D);
+        hadron_p5 = new EMDefinitionStack(hadron_p, 5D);
+
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + -64);
+        }
+    }
+
+    public static void setTransformations(){
+        //Added to atom map, but should be in its own
+        EMDefinitionStack neutrons =new EMDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
+        TRANSFORMATION_INFO.getOredictDequantization().put(neutrons.getDefinition(),new EMOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
+        TRANSFORMATION_INFO.getOredictQuantization().put(
+                OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
+                new EMOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
+        );
+    }
+
+    @Override
+    public byte getClassType() {
+        return -64;
+    }
+
+    public static byte getClassTypeStatic(){
+        return -64;
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+        }
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+getSimpleName());
+            //lines.add("SYMBOL = "+getSymbol());
+        }
+        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    "+"At current energy level");
+        }
+    }
+
+    public double getRawLifeTime() {
+        return rawLifeTime;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
new file mode 100644
index 0000000000..9a22f54941
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
@@ -0,0 +1,336 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.util.Util.splitButDifferent;
+
+public final class EMNuclideIAEA {
+    public static final double AMU_TO_EV_DIV_C_C=9.31494061E08D,MICRO_AMU_TO_EV_DIV_C_C=9.31494061E02D;
+
+    //Nuclide			 T1/2 	 T1/2 [s]	 Decay Modes		  ? 	 Q 	 Q?-	 Q?	 QEC	 Q?- n	 Sn	 Sp	 Binding/A	 Atomic Mass	 Mass Excess	 Discovery
+    //Abund. [mole fract.]		 BR [%]		[?N]	[barn]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[? AMU]	[keV]
+
+    //Z,N,symb,radius, unc, energy, unc, jp, half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quad , unc,Qb-,unc,Qb- n,unc,Qa, unc, Qec, unc,Sn,unc, Sp,unc,Binding/A,unc,atomic mass, unc, mass excess,unc,
+    //Z,N,symbol,energy , unc, jp,half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quadrupole , unc,
+    private static final HashMap<Integer, EMNuclideIAEA> NUCLIDES =new HashMap<>();
+
+    public static void run(){
+        String line="";
+
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("nuclides.csv")));
+            ArrayList<String[]> blockOfData=new ArrayList<>(4);
+            while((line=reader.readLine())!=null) {
+                String[] split= splitButDifferent(line,",");
+                if(split.length!=19) {
+                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclides database " + line);
+                }
+                if(!split[1].isEmpty() && !blockOfData.isEmpty()) {
+                    new EMNuclideIAEA(blockOfData.toArray(new String[blockOfData.size()][]));
+                    blockOfData.clear();
+                }
+                blockOfData.add(split);
+            }
+            if(!blockOfData.isEmpty()) {
+                new EMNuclideIAEA(blockOfData.toArray(new String[blockOfData.size()][]));
+                blockOfData.clear();
+            }
+            reader.close();
+        }catch (Exception e){
+            System.out.println(line);
+            e.printStackTrace();
+        }
+
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("nuclidesTable.csv")));
+            while((line=reader.readLine())!=null) {
+                String[] split= splitButDifferent(line,",");
+                if(split.length!=47) {
+                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclidesTable database " + line);
+                }
+                get(Integer.parseInt(split[0]),Integer.parseInt(split[1])).getMoreData(split);
+            }
+            reader.close();
+        }catch (Exception e){
+            System.out.println(line);
+            e.printStackTrace();
+        }
+
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("energyLevels.csv")));
+            while((line=reader.readLine())!=null) {
+                String[] split= splitButDifferent(line,",");
+                if(split.length!=27) {
+                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA energyLevels database " + line);
+                }
+                new energeticState(split);
+            }
+            reader.close();
+        }catch (Exception e){
+            System.out.println(line);
+            e.printStackTrace();
+        }
+
+        for(EMNuclideIAEA nuclide:NUCLIDES.values()) {
+            nuclide.makeArrayOfEnergyStates();
+        }
+    }
+
+    public static EMNuclideIAEA get(int protons, int neutrons){
+        return NUCLIDES.get((protons<<16)+neutrons);
+    }
+
+    private final short N;
+    private final short Z;
+    private final double                         halfTime;//sec
+    private final double                         mass;//eV/c^2
+    private final short                          discovery;//year
+    private       TreeMap<Double,energeticState> energeticStates;
+    private       energeticState[]               energeticStatesArray;
+
+
+    private EMNuclideIAEA(String[][] rows){
+        N=Short.parseShort(rows[1][2]);
+        Z=Short.parseShort(rows[1][0]);
+        NUCLIDES.put(((int) getZ() <<16)+ getN(),this);
+
+        String[] parts = splitButDifferent(rows[0][16], "|");
+        double Mass=doubleOrNaN(parts[0],"mass");
+        if(!Double.isNaN(Mass)) {
+            //System.out.println("Mass =\t" + Mass+"\t"+(N+Z)+"\t"+N+"\t"+Z+"\t"+(Mass/(N+Z)));
+            mass = Mass* MICRO_AMU_TO_EV_DIV_C_C;
+        }
+        else {
+            mass = Double.NaN;
+        }
+
+        discovery=(short)doubleOrNaN(rows[0][18],"discovery");
+
+        if(rows[0][3].contains("STABLE")){
+            halfTime = STABLE_RAW_LIFE_TIME;
+        }else{
+            parts = splitButDifferent(rows[0][4], "|");
+            halfTime = doubleOrNaN(parts[0],"half life");
+        }
+    }
+
+    private void getMoreData(String[] cells){
+        //if(DEBUG_MODE) {
+        //    if (add(cells[14])) System.out.println(N + " " + Z);
+        //    if (add(cells[17])) System.out.println(N + " " + Z);
+        //    if (add(cells[20])) System.out.println(N + " " + Z);
+        //}
+        new energeticState(this, getHalfTime(), getDecaysFixed(
+                cells[14],
+                doubleOrNaN(cells[15],"chance1"),
+                cells[17],
+                doubleOrNaN(cells[18],"chance1"),
+                cells[20],
+                doubleOrNaN(cells[21],"chance1")));
+    }
+
+    private static final energeticState[] empty=new energeticState[0];
+    private void makeArrayOfEnergyStates(){
+        if(energeticStates==null || energeticStates.isEmpty()) {
+            setEnergeticStatesArray(empty);
+        } else {
+            setEnergeticStatesArray(energeticStates.values().toArray(new energeticState[0]));
+            double life= getHalfTime();
+            for (energeticState energeticState : getEnergeticStatesArray()) {
+                if(Double.isNaN(energeticState.Thalf)){
+                    energeticState.Thalf=life;
+                }else {
+                    life=energeticState.Thalf;
+                }
+            }
+        }
+    }
+
+    private double doubleOrNaN(String s, String name){
+        s=s.replaceAll("#","");
+        if(!s.isEmpty()) {
+            try {
+                double value=Double.parseDouble(s);
+                if(Double.isNaN(value)) {
+                    return Double.NaN;
+                }
+                return value != 0 ?value:Double.NaN;
+            } catch (Exception e) {
+                System.out.println("Invalid Value " + name + ' ' + getN() + ' ' + getZ() + ' ' + s);
+                e.printStackTrace();
+            }
+        }
+        return Double.NaN;
+    }
+
+    public short getN() {
+        return N;
+    }
+
+    public short getZ() {
+        return Z;
+    }
+
+    public double getHalfTime() {
+        return halfTime;
+    }
+
+    public double getMass() {
+        return mass;
+    }
+
+    public short getDiscovery() {
+        return discovery;
+    }
+
+    public energeticState[] getEnergeticStatesArray() {
+        return energeticStatesArray;
+    }
+
+    public void setEnergeticStatesArray(energeticState[] energeticStatesArray) {
+        this.energeticStatesArray = energeticStatesArray;
+    }
+
+    public static final class energeticState{
+        public final double energy;
+        public double Thalf;
+        public final iaeaDecay[] decaymodes;
+
+        private energeticState(EMNuclideIAEA nuclide, double Thalf, iaeaDecay[] decaymodes){
+            energy=0;
+            this.Thalf=Thalf;
+            this.decaymodes=decaymodes;
+            if(nuclide.energeticStates==null) {
+                nuclide.energeticStates = new TreeMap<>();
+            }
+            nuclide.energeticStates.put(energy,this);
+        }
+
+        private energeticState(String[] cells){
+            EMNuclideIAEA nuclide = get((int)doubleOrNaN(cells[0],"protons"),(int)doubleOrNaN(cells[1],"neutrons"));
+            if(nuclide==null) {
+                throw new Error("Missing nuclide " + (int) doubleOrNaN(cells[0], "protons") + ' ' + (int) doubleOrNaN(cells[1], "neutrons"));
+            }
+            energy =doubleOrNaN(cells[3],"energy level",nuclide)*1000D;//to eV
+            if(energy<0) {
+                throw new Error("Invalid energy " + nuclide.getN() + ' ' + nuclide.getZ() + ' ' + cells[3]);
+            }
+            Thalf =doubleOrNaN(cells[10],"half life",nuclide);
+            if(nuclide.energeticStates==null) {
+                new Exception("Should be initialized before doing this... "+ nuclide.getN() + ' ' + nuclide.getZ()).printStackTrace();
+                nuclide.energeticStates = new TreeMap<>();
+            }
+            nuclide.energeticStates.put(energy,this);
+            //if(DEBUG_MODE) {
+            //    if (add(cells[12])) System.out.println(nuclide.N + " " + nuclide.Z);
+            //    if (add(cells[15])) System.out.println(nuclide.N + " " + nuclide.Z);
+            //    if (add(cells[18])) System.out.println(nuclide.N + " " + nuclide.Z);
+            //}
+            decaymodes = getDecaysFixed(
+                    cells[12],
+                    doubleOrNaN(cells[13],"chance 1",nuclide),
+                    cells[15],
+                    doubleOrNaN(cells[16],"chance 2",nuclide),
+                    cells[18],
+                    doubleOrNaN(cells[19],"chance 3",nuclide));
+        }
+
+        private double doubleOrNaN(String s, String name){
+            return doubleOrNaN(s,name,null);
+        }
+
+        private double doubleOrNaN(String s, String name, EMNuclideIAEA nuclide){
+            s = s.replaceAll("#", "");
+            if (!s.isEmpty()) {
+                try {
+                    return Double.parseDouble(s);
+                } catch (Exception e) {
+                    if(nuclide==null){
+                        System.out.println("Invalid Value " + name + ' ' + s);
+                    }else {
+                        System.out.println("Invalid Value " + name + ' ' + nuclide.getN() + ' ' + nuclide.getZ() + ' ' + s);
+                    }
+                    e.printStackTrace();
+                }
+            }
+            return Double.NaN;
+        }
+    }
+
+    private static HashSet<String> decays=new HashSet<>();
+    private static boolean add(String s){
+        if(decays.add(s)){
+            System.out.println(s);
+            return true;
+        }
+        return false;
+    }
+
+    private static iaeaDecay[] getDecaysFixed(String decay1, double chance1,String decay2, double chance2,String decay3, double chance3){
+        boolean do1,do2,do3;
+        do1= !decay1.isEmpty() && !Double.isNaN(chance1);
+        do2= !decay2.isEmpty() && !Double.isNaN(chance2);
+        do3= !decay3.isEmpty() && !Double.isNaN(chance3);
+        TreeMap<Double,iaeaDecay> decays=new TreeMap<>();
+        if(do1 && do2 && chance1==100 && chance2==100 && chance3!=100){
+            decays.put(1D, new iaeaDecay(1D, decay1));
+            if(do3) {
+                chance3/=100d;
+                decays.put(chance3, new iaeaDecay(chance3, decay2));
+                chance2=1d-chance3;
+            }
+            chance2/=2d;
+            decays.put(chance2, new iaeaDecay(chance2, decay2));
+        }else if(do1 && chance1==100){
+            decays.put(1D, new iaeaDecay(1D, decay1));
+            if(do2) {
+                chance2/=100d;
+                decays.put(chance2, new iaeaDecay(chance2, decay2));
+            }
+            if(do3) {
+                chance3 /= 100d;
+                if(do2) {
+                    chance3 *= chance2;
+                }
+                decays.put(chance3, new iaeaDecay(chance3, decay3));
+            }
+        }else{
+            double normalization= (do1?chance1:0) + (do2?chance2:0) + (do3?chance3:0);
+            if(do1) {
+                chance1/=normalization;
+                decays.put(chance1, new iaeaDecay(chance1, decay1));
+            }
+            if(do2) {
+                chance2/=normalization;
+                decays.put(chance2, new iaeaDecay(chance2, decay2));
+            }
+            if(do3) {
+                chance3/=normalization;
+                decays.put(chance3, new iaeaDecay(chance3, decay3));
+            }
+            if(do1||do2||do3) {
+                decays.put(1D, iaeaDecay.DEAD_END);
+            }
+        }
+        //if(DEBUG_MODE){
+        //    System.out.println("INVALID SUM?\t"+normalization+"\t"+decay1+"\t"+chance1+"\t"+decay2+"\t"+chance2+"\t"+decay3+"\t"+chance3);
+        //}
+        return decays.values().toArray(new iaeaDecay[0]);
+    }
+
+    public static final class iaeaDecay{
+        public final double chance;
+        public final String decayName;
+        public static final iaeaDecay DEAD_END=new iaeaDecay(1D,"DEAD_END");
+        private iaeaDecay(double chance,String decayName){
+            this.chance=chance;
+            this.decayName=decayName;
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
deleted file mode 100644
index 291ec8fe6b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
+++ /dev/null
@@ -1,1678 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
-
-import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eNeutrinoDefinition;
-import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.util.XSTR;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Materials;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition.getNbtTagCompound;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.deadEnd;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
-import static gregtech.api.enums.OrePrefixes.dust;
-
-/**
- * Created by danie_000 on 18.11.2016.
- */
-public final class dAtomDefinition extends cElementalDefinition {
-    public static final long ATOM_COMPLEXITY_LIMIT=65536L;
-    private static final byte BYTE_OFFSET=32;
-
-    private final int hash;
-    public static double refMass, refUnstableMass;
-
-    private static final byte nbtType = (byte) 'a';
-    private static final Random xstr = new XSTR();//NEEDS SEPARATE!
-    private static Map<Integer, TreeSet<Integer>> stableIsotopes = new HashMap<>();
-    private static final Map<Integer, dAtomDefinition> stableAtoms = new HashMap<>();
-    private static Map<Integer, TreeMap<Double, Integer>> mostStableUnstableIsotopes = new HashMap<>();
-    private static final Map<Integer, dAtomDefinition> unstableAtoms = new HashMap<>();
-    private static cElementalDefinitionStack alpha,deuterium,tritium,helium_3,beryllium_8,carbon_14,neon_24,silicon_34;
-    private static final HashMap<dAtomDefinition,Double> lifetimeOverrides = new HashMap<>();
-
-    public final iaeaNuclide iaea;
-
-    private static dAtomDefinition somethingHeavy;
-    public static dAtomDefinition getSomethingHeavy() {
-        return somethingHeavy;
-    }
-
-    private static final ArrayList<Runnable> overrides = new ArrayList<>();
-    public static void addOverride(dAtomDefinition atom, double rawLifeTime){
-        lifetimeOverrides.put(atom,rawLifeTime);
-    }
-
-    //float-mass in eV/c^2
-    public final double mass;
-    //public final int charge;
-    public final int charge;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    public final int chargeLeptons;
-    private double rawLifeTime;
-    //generation max present inside - minus if contains any anti quark
-    public final byte type;
-
-    public final byte decayMode;//t neutron to proton+,0,f proton to neutron
-    //public final boolean stable;
-
-    public final int neutralCount;
-    public final int element;
-
-    private final boolean iaeaDefinitionExistsAndHasEnergyLevels;
-
-    private final cElementalConstantStackMap elementalStacks;
-
-    //stable is rawLifeTime>=10^9
-
-    public dAtomDefinition(cElementalDefinitionStack... things) throws tElementalException {
-        this(true, new cElementalConstantStackMap(things));
-    }
-
-    private dAtomDefinition(boolean check, cElementalDefinitionStack... things) throws tElementalException {
-        this(check, new cElementalConstantStackMap(things));
-    }
-
-    public dAtomDefinition(cElementalConstantStackMap things) throws tElementalException {
-        this(true, things);
-    }
-
-    private dAtomDefinition(boolean check, cElementalConstantStackMap things) throws tElementalException {
-        if (check && !canTheyBeTogether(things)) {
-            throw new tElementalException("Atom Definition error");
-        }
-        elementalStacks = things;
-
-        double mass = 0;
-        int cLeptons = 0;
-        int cNucleus = 0;
-        int neutralCount = 0, element = 0;
-        int type = 0;
-        boolean containsAnti = false;
-        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
-            iElementalDefinition def = stack.definition;
-            int amount = (int)stack.amount;
-            if((int)stack.amount!=stack.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            mass += stack.getMass();
-            if (def.getType() < 0) {
-                containsAnti = true;
-            }
-            type = Math.max(type, Math.abs(def.getType()));
-
-            if (def instanceof eLeptonDefinition) {
-                cLeptons += stack.getCharge();
-            } else {
-                cNucleus += stack.getCharge();
-                if (def.getCharge() == 3) {
-                    element += amount;
-                } else if (def.getCharge() == -3) {
-                    element -= amount;
-                } else if (def.getCharge() == 0) {
-                    neutralCount += amount;
-                }
-            }
-        }
-        this.type = containsAnti ? (byte) -type : (byte) type;
-        //this.mass = mass;
-        chargeLeptons = cLeptons;
-        charge = cNucleus + cLeptons;
-        this.neutralCount = neutralCount;
-        this.element = element;
-
-        element = Math.abs(element);
-
-        //stability curve
-        int StableIsotope = stableIzoCurve(element);
-        int izoDiff = neutralCount - StableIsotope;
-        int izoDiffAbs = Math.abs(izoDiff);
-
-        xstr.setSeed((element + 1L) * (neutralCount + 100L));
-        iaea =iaeaNuclide.get(element,neutralCount);
-        if(iaea!=null){
-            if(Double.isNaN(iaea.mass)) {
-                this.mass = mass;
-            } else {
-                this.mass = iaea.mass;
-            }
-
-            if(Double.isNaN(iaea.halfTime)) {
-                Double overriddenLifeTime= lifetimeOverrides.get(this);
-                double rawLifeTimeTemp;
-                if(overriddenLifeTime!=null) {
-                    rawLifeTimeTemp = overriddenLifeTime;
-                } else {
-                    rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
-                }
-                rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
-            }else {
-                rawLifeTime = containsAnti ? iaea.halfTime * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) : iaea.halfTime;
-            }
-            iaeaDefinitionExistsAndHasEnergyLevels =iaea.energeticStatesArray.length>1;
-        }else{
-            this.mass=mass;
-
-            Double overriddenLifeTime= lifetimeOverrides.get(this);
-            double rawLifeTimeTemp;
-            if(overriddenLifeTime!=null) {
-                rawLifeTimeTemp = overriddenLifeTime;
-            } else {
-                rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
-            }
-            rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
-
-            iaeaDefinitionExistsAndHasEnergyLevels =false;
-        }
-
-        if(iaea==null || iaea.energeticStatesArray[0].energy!=0) {
-            if (izoDiff == 0) {
-                decayMode = 0;
-            } else {
-                decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4);
-            }
-        }else{
-            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4)+ BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
-        }
-        //this.stable = this.rawLifeTime >= STABLE_RAW_LIFE_TIME;
-        hash=super.hashCode();
-    }
-
-    private static int stableIzoCurve(int element) {
-        return (int) Math.round(-1.19561E-06D * Math.pow(element, 4D) +
-                1.60885E-04D * Math.pow(element, 3D) +
-                3.76604E-04D * Math.pow(element, 2D) +
-                1.08418E+00D * (double) element);
-    }
-
-    private static double calculateLifeTime(int izoDiff, int izoDiffAbs, int element, int isotope, boolean containsAnti) {
-        double rawLifeTime;
-
-        if (element <= 83 && isotope < 127 && (izoDiffAbs == 0 || element == 1 && isotope == 0 || element == 2 && isotope == 1 || izoDiffAbs == 1 && element > 2 && element % 2 == 1 || izoDiffAbs == 3 && element > 30 && element % 2 == 0 || izoDiffAbs == 5 && element > 30 && element % 2 == 0 || izoDiffAbs == 2 && element > 20 && element % 2 == 1)) {
-            rawLifeTime = (1D + xstr.nextDouble() * 9D) * (containsAnti ? 2.381e4D : 1.5347e25D);
-        } else {
-            //Y = (X-A)/(B-A) * (D-C) + C
-            double unstabilityEXP;
-            if (element == 0) {
-                return 1e-35D;
-            } else if (element == 1) {
-                unstabilityEXP = 1.743D - Math.abs(izoDiff - 1) * 9.743D;
-            } else if (element == 2) {
-                switch (isotope) {
-                    case 4:
-                        unstabilityEXP = 1.61D;
-                        break;
-                    case 5:
-                        unstabilityEXP = -7.523D;
-                        break;
-                    case 6:
-                        unstabilityEXP = -1.51D;
-                        break;
-                    default:
-                        unstabilityEXP = -(izoDiffAbs * 6.165D);
-                        break;
-                }
-            } else if (element <= 83 || isotope <= 127 && element <= 120) {
-                double elementPow4 = Math.pow(element, 4);
-
-                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - Math.abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
-            } else if (element < 180) {
-                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - Math.abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
-            } else {
-                return -1;
-            }
-            if ((isotope == 127 || isotope == 128) && element < 120 && element > 83) {
-                unstabilityEXP -= 1.8D;
-            }
-            if (element > 83 && element < 93 && isotope % 2 == 0 && izoDiff == 3) {
-                unstabilityEXP += 6;
-            }
-            if (element > 93 && element < 103 && isotope % 2 == 0 && izoDiff == 4) {
-                unstabilityEXP += 6;
-            }
-            rawLifeTime = (containsAnti ? 1e-8D : 1) * Math.pow(10D, unstabilityEXP) * (1D + xstr.nextDouble() * 9D);
-        }
-
-        if (rawLifeTime < 8e-15D) {
-            return 1e-35D;
-        }
-        if (rawLifeTime > 8e28D) {
-            return 8e30D;
-        }
-        return rawLifeTime;
-    }
-
-    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
-        boolean nuclei = false;
-        long qty=0;
-        for (cElementalDefinitionStack stack : stacks.valuesToArray()) {
-            if (stack.definition instanceof dHadronDefinition) {
-                if (((dHadronDefinition) stack.definition).amount != 3) {
-                    return false;
-                }
-                nuclei = true;
-            } else if (!(stack.definition instanceof eLeptonDefinition)) {
-                return false;
-            }
-            if((int)stack.amount!=stack.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            qty+=stack.amount;
-        }
-        return nuclei && qty<ATOM_COMPLEXITY_LIMIT;
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    public int getChargeLeptons() {
-        return chargeLeptons;
-    }
-
-    public int getChargeHadrons() {
-        return charge - chargeLeptons;
-    }
-
-    public int getIonizationElementWise() {
-        return element * 3 + chargeLeptons;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        if(currentEnergy<=0) {
-            return rawLifeTime;
-        }
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            if(currentEnergy>=iaea.energeticStatesArray.length){
-                return iaea.energeticStatesArray[iaea.energeticStatesArray.length-1].Thalf/(currentEnergy-iaea.energeticStatesArray.length+1);
-            }
-            return iaea.energeticStatesArray[(int)currentEnergy].Thalf;
-        }
-        return rawLifeTime/(currentEnergy+1);
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-
-    @Override
-    public byte getColor() {
-        return -10;
-    }
-
-    @Override
-    public String getName() {
-        int element = Math.abs(this.element);
-        boolean negative = this.element < 0;
-        try {
-            if (Math.abs(type) != 1) {
-                return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
-            }
-            return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return (negative ? "Element: ~" : "Element: ") + element;
-        }
-    }
-
-    @Override
-    public String getSymbol() {
-        int element = Math.abs(this.element);
-        boolean negative = this.element < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + neutralCount + " I:" + (neutralCount+element) + " C:" + getCharge();
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + neutralCount + " I:" + (neutralCount+element) + " C:" + getCharge();
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "? N:" + neutralCount + " I:" + (neutralCount+element) + " C:" + getCharge();
-            }
-        }
-    }
-
-    @Override
-    public String getShortSymbol() {
-        int element = Math.abs(this.element);
-        boolean negative = this.element < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1];
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "?";
-            }
-        }
-    }
-
-    @Override
-    public cElementalConstantStackMap getSubParticles() {
-        return elementalStacks.clone();
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        ArrayList<cElementalDecay> decaysList=new ArrayList<>(4);
-        return getDecayArray(decaysList,decayMode,true);
-    }
-
-    private cElementalDecay[] getDecayArray(ArrayList<cElementalDecay> decaysList,int decayMode,boolean tryAnti) {//todo?
-        if (type == 1) {
-            switch (decayMode) {
-                case -2:
-                    if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    } else if(PbetaDecay(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case -1:
-                    if(Emmision(decaysList, dHadronDefinition.hadron_p1)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case 0:
-                    if(alphaDecay(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case 1:
-                    if(Emmision(decaysList, dHadronDefinition.hadron_n1)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case 2:
-                    if(MbetaDecay(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                default:
-                    if(decayMode>8){
-                        if(iaeaDecay(decaysList,0)) {
-                            return decaysList.toArray(cElementalDecay.noProduct);
-                        }
-                        return getDecayArray(decaysList,decayMode- BYTE_OFFSET,false);
-                    }
-            }
-            return cElementalDecay.noDecay;
-        }else if(type ==-1){
-            dAtomDefinition anti=getAnti();
-            if(anti!=null) {
-                return anti.getDecayArray(decaysList, decayMode, false);
-            }
-        }
-        return getNaturalDecayInstant();
-    }
-
-    private boolean iaeaDecay(ArrayList<cElementalDecay> decaysList,long energy){
-        iaeaNuclide.energeticState state;
-        if(energy>iaea.energeticStatesArray.length) {
-            state = iaea.energeticStatesArray[iaea.energeticStatesArray.length - 1];
-        } else if(energy<=0) {
-            state = iaea.energeticStatesArray[0];
-        } else {
-            state = iaea.energeticStatesArray[(int) energy];
-        }
-        for (int i=0;i<state.decaymodes.length;i++){
-            if(!getDecayFromIaea(decaysList,state.decaymodes[i],energy)) {
-                decaysList.clear();
-                return false;
-            }
-        }
-        return !decaysList.isEmpty();
-    }
-
-    private boolean getDecayFromIaea(ArrayList<cElementalDecay> decaysList, iaeaNuclide.iaeaDecay decay, long energy){
-        cElementalDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new cElementalDefinitionStackMap();
-        switch (decay.decayName){
-            case "D": {
-                if (withThis.removeAllAmounts(false, deuterium.definition.getSubParticles())){
-                    withThis.putReplace(deuterium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "3H": {
-                if (withThis.removeAllAmounts(false, tritium.definition.getSubParticles())){
-                    withThis.putReplace(tritium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "3HE": {
-                if (withThis.removeAllAmounts(false, helium_3.definition.getSubParticles())){
-                    withThis.putReplace(helium_3);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "8BE": {
-                if (withThis.removeAllAmounts(false, beryllium_8.definition.getSubParticles())){
-                    withThis.putReplace(beryllium_8);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "14C": {
-                if (withThis.removeAllAmounts(false, carbon_14.definition.getSubParticles())){
-                    newStuff.putReplace(carbon_14);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "24NE": {
-                if (withThis.removeAllAmounts(false, neon_24.definition.getSubParticles())){
-                    newStuff.putReplace(neon_24);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "34SI": {
-                if (withThis.removeAllAmounts(false, silicon_34.definition.getSubParticles())){
-                    newStuff.putReplace(silicon_34);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "A": case "A?": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2,dHadronDefinition.hadron_p2)){
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_2);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2B-": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
-                    withThis.putUnify(dHadronDefinition.hadron_p2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e2);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "EC": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2EC": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B++EC": case "EC+B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+A": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p3, dHadronDefinition.hadron_n1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+2P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p3)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-A": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n3, dHadronDefinition.hadron_p1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(dHadronDefinition.hadron_n1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-2N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n3)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(dHadronDefinition.hadron_n2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECA": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1,eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p3)){
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECP": {
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "EC2P": {
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p3)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECP+EC2P": {//todo look at branching ratios
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e2,dHadronDefinition.hadron_p5)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    newStuff.putReplace(dHadronDefinition.hadron_p3);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    newStuff.putReplace(dHadronDefinition.hadron_n1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
-                    newStuff.putReplace(dHadronDefinition.hadron_n2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
-                    newStuff.putReplace(dHadronDefinition.hadron_p2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "SF": {
-                if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
-                    return true;
-                }
-            } break;
-            case "B-F": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECF": case "ECSF": case "EC(+SF)": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "SF(+EC+B+)": case "SF+EC+B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "SF+EC+B-": {
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "IT": case "IT?": case "G": {
-                if(energy>0){
-                    decaysList.add(new cElementalDecay(decay.chance, this, boson_Y__));
-                }else{
-                    if(DEBUG_MODE) {
-                        TecTech.LOGGER.info("Tried to emit Gamma from ground state");
-                    }
-                    decaysList.add(new cElementalDecay(decay.chance, this));
-                }
-                return true;
-            } //break;
-            case "IT+EC+B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    newStuff.putReplace(eBosonDefinition.boson_Y__1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "DEAD_END":
-                decaysList.add(deadEnd);
-                return true;
-            default: throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + neutralCount+ ' ' +element);
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Failed to decay " + element + ' ' + neutralCount + ' ' + decay.decayName);
-        }
-        return false;
-    }
-
-    private boolean Emmision(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStack emit) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAmount(false, emit)) {
-            try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), emit));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean alphaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAllAmounts(false, alpha.definition.getSubParticles())) {
-            try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), alpha));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean MbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAmount(false, dHadronDefinition.hadron_n1)) {
-            try {
-                tree.putUnify(dHadronDefinition.hadron_p1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e1, eNeutrinoDefinition.lepton_Ve_1));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean PbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAmount(false, dHadronDefinition.hadron_p1)) {
-            try {
-                tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e_1, eNeutrinoDefinition.lepton_Ve1));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean ElectronCapture(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)) {
-            try {
-                tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eNeutrinoDefinition.lepton_Ve1));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean Fission(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStackMap fissile, cElementalDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
-        cElementalDefinitionStackMap heavy      = new cElementalDefinitionStackMap();
-        double[]                     liquidDrop = liquidDropFunction(Math.abs(element)<=97);
-
-        for(cElementalDefinitionStack stack: fissile.valuesToArray()){
-            if(spontaneousCheck && stack.definition instanceof dHadronDefinition &&
-                    (stack.amount<=80 || stack.amount<90 && XSTR_INSTANCE.nextInt(10)<stack.amount-80)) {
-                return false;
-            }
-            if(stack.definition.getCharge()==0){
-                //if(stack.definition instanceof dHadronDefinition){
-                    double neutrals=stack.amount*liquidDrop[2];
-                    int neutrals_cnt=(int)Math.floor(neutrals);
-                    neutrals_cnt+=neutrals-neutrals_cnt>XSTR_INSTANCE.nextDouble()?1:0;
-                    particles.putUnify(new cElementalDefinitionStack(stack.definition, neutrals_cnt));
-
-                    int heavy_cnt=(int)Math.ceil(stack.amount*liquidDrop[1]);
-                    while(heavy_cnt+neutrals_cnt>stack.amount) {
-                        heavy_cnt--;
-                    }
-                    fissile.removeAmount(false,new cElementalDefinitionStack(stack.definition,heavy_cnt+neutrals_cnt));
-                    heavy.putReplace(new cElementalDefinitionStack(stack.definition, heavy_cnt));
-                //}else{
-                //    particles.add(stack);
-                //    light.remove(stack.definition);
-                //}
-            }else{
-                int heavy_cnt=(int)Math.ceil(stack.amount*liquidDrop[0]);
-                if(heavy_cnt%2==1 && XSTR_INSTANCE.nextDouble()>0.05D) {
-                    heavy_cnt--;
-                }
-                cElementalDefinitionStack new_stack=new cElementalDefinitionStack(stack.definition, heavy_cnt);
-                fissile.removeAmount(false,new_stack);
-                heavy.putReplace(new_stack);
-            }
-        }
-
-        try {
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
-            decaysList.add(new cElementalDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-            return true;
-        } catch (Exception e) {
-            if(DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        return false;
-    }
-
-    private static double[] liquidDropFunction(boolean asymmetric) {
-        double[] out = new double[3];
-
-        out[0] = XSTR_INSTANCE.nextGaussian();
-
-        if (out[0] < 1 && out[0] >= -1) {
-            if (XSTR_INSTANCE.nextBoolean()) {
-                out[0] = XSTR_INSTANCE.nextDouble() * 2d - 1d;
-            }
-        }
-
-        if (asymmetric && out[0] > XSTR_INSTANCE.nextDouble() && XSTR_INSTANCE.nextInt(4) == 0) {
-            out[0] = -out[0];
-        }
-
-        //scale to splitting ratio
-        out[0] = out[0] * 0.05d + .6d;
-
-        if (out[0] < 0 || out[0] > 1) {
-            return liquidDropFunction(asymmetric);
-        }
-        if (out[0] < .5d) {
-            out[0] = 1d - out[0];
-        }
-
-        //extra neutrals
-        out[2] = 0.012d + XSTR_INSTANCE.nextDouble() * 0.01d;
-
-        if (asymmetric) {
-            out[1] = out[0];
-        } else {
-            out[1] = out[0] - out[2] * .5d;
-        }
-
-        return out;
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        if (iaeaDefinitionExistsAndHasEnergyLevels) {
-            ArrayList<cElementalDecay> decays=new ArrayList<>(4);
-            if(iaeaDecay(decays,energyLevel)){
-                return decays.toArray(cElementalDecay.noProduct);
-            }
-        }
-        if(energyLevel< Math.abs(charge)/3+neutralCount) {
-            return new cElementalDecay[]{new cElementalDecay(1, this, boson_Y__)};
-        }
-        return getNaturalDecayInstant();
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel,long newEnergyLevel) {
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            double result=0;
-            boolean backwards=newEnergyLevel<currentEnergyLevel;
-            if(backwards){
-                long temp=currentEnergyLevel;
-                currentEnergyLevel=newEnergyLevel;
-                newEnergyLevel=temp;
-            }
-
-            if(currentEnergyLevel<=0){
-                if(newEnergyLevel<=0) {
-                    return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
-                } else {
-                    result += iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * -currentEnergyLevel;
-                }
-            }else {
-                result -= iaea.energeticStatesArray[(int) Math.min(iaea.energeticStatesArray.length - 1, currentEnergyLevel)].energy;
-            }
-            if(newEnergyLevel>=iaea.energeticStatesArray.length){
-                if(currentEnergyLevel>=iaea.energeticStatesArray.length) {
-                    return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
-                } else {
-                    result += iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - iaea.energeticStatesArray.length + 1);
-                }
-                result+=iaea.energeticStatesArray[iaea.energeticStatesArray.length-1].energy;
-            }else {
-                result += iaea.energeticStatesArray[(int) Math.max(0, newEnergyLevel)].energy;
-            }
-
-            return backwards?-result:result;
-        }
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return iaeaDefinitionExistsAndHasEnergyLevels;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        if(!iaeaDefinitionExistsAndHasEnergyLevels) return false;
-        iaeaNuclide.energeticState state;
-        if(energyLevel>iaea.energeticStatesArray.length) {
-            state = iaea.energeticStatesArray[iaea.energeticStatesArray.length - 1];
-        } else if(energyLevel<=0) {
-            state = iaea.energeticStatesArray[0];
-        } else {
-            state = iaea.energeticStatesArray[(int) energyLevel];
-        }
-        for (iaeaNuclide.iaeaDecay decay:state.decaymodes){
-            if(decay.decayName.contains("F")) return true;//if is fissile
-        }
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return iaeaDefinitionExistsAndHasEnergyLevels;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return iaea!=null || iaeaDefinitionExistsAndHasEnergyLevels;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        //disembody
-        ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<>();
-        for (cElementalDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
-            if (elementalStack.definition.getType() == 1 || elementalStack.definition.getType() == -1) {
-                //covers both quarks and antiquarks
-                decaysInto.add(elementalStack);
-            } else {
-                //covers both quarks and antiquarks
-                decaysInto.add(new cElementalDefinitionStack(boson_Y__, 2));
-            }
-        }
-        return new cElementalDecay[]{new cElementalDecay(0.75D, decaysInto.toArray(new cElementalDefinitionStack[0])), deadEnd};
-    }
-
-    //@Override
-    //public iElementalDefinition getAnti() {
-    //    cElementalDefinitionStack[] stacks = this.elementalStacks.values();
-    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
-    //    for (int i = 0; i < antiElements.length; i++) {
-    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
-    //    }
-    //    try {
-    //        return new dAtomDefinition(false, antiElements);
-    //    } catch (tElementalException e) {
-    //        if (DEBUG_MODE) e.printStackTrace();
-    //        return null;
-    //    }
-    //}
-
-    @Override
-    public dAtomDefinition getAnti() {
-        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
-        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
-            anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
-        }
-        try {
-            return new dAtomDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return bTransformationInfo.TRANSFORMATION_INFO.fluidDequantization.get(this);
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return bTransformationInfo.TRANSFORMATION_INFO.itemDequantization.get(this);
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return bTransformationInfo.TRANSFORMATION_INFO.oredictDequantization.get(this);
-    }
-
-    private static final class Nomenclature {
-        private static final String[] SYMBOL = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
-        private static final String[] NAME = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
-        private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
-    }
-
-    @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, elementalStacks);
-    }
-
-    public static dAtomDefinition fromNBT(NBTTagCompound nbt) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new dAtomDefinition(stacks);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    public static void run() {
-        for (Runnable r : overrides) {
-            r.run();
-        }
-
-        for(Map.Entry<dAtomDefinition,Double> entry:lifetimeOverrides.entrySet()){
-            try {
-                lifetimeOverrides.put(new dAtomDefinition(entry.getKey().elementalStacks), entry.getValue());
-            }catch (tElementalException e){
-                e.printStackTrace(); //Impossible
-            }
-        }
-
-        //populate stable isotopes
-        for (int element = 1; element < 83; element++)//Up to Bismuth exclusive
-        {
-            for (int isotope = 0; isotope < 130; isotope++) {
-                xstr.setSeed((long) (element + 1) * (isotope + 100));
-                //stability curve
-                int StableIsotope = stableIzoCurve(element);
-                int izoDiff = isotope - StableIsotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                iaeaNuclide nuclide = iaeaNuclide.get(element, isotope);
-                if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.halfTime >= STABLE_RAW_LIFE_TIME) {
-                    TreeSet<Integer> isotopes = stableIsotopes.computeIfAbsent(element, k -> new TreeSet<>());
-                    isotopes.add(isotope);
-                }
-            }
-        }
-
-        //populate unstable isotopes
-        for (int element = 83; element < 150; element++) {
-            for (int isotope = 100; isotope < 180; isotope++) {
-                xstr.setSeed((long) (element + 1) * (isotope + 100));
-                //stability curve
-                int Isotope = stableIzoCurve(element);
-                int izoDiff = isotope - Isotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                TreeMap<Double, Integer> isotopes = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
-                isotopes.put(rawLifeTime, isotope);
-            }
-        }
-
-        try {
-            for (Map.Entry<Integer, TreeSet<Integer>> integerTreeSetEntry : stableIsotopes.entrySet()) {
-                stableAtoms.put(integerTreeSetEntry.getKey(), new dAtomDefinition(
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_p, integerTreeSetEntry.getKey()),
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_n, integerTreeSetEntry.getValue().first()),
-                        new cElementalDefinitionStack(eLeptonDefinition.lepton_e, integerTreeSetEntry.getKey())));
-                if (DEBUG_MODE) {
-                    TecTech.LOGGER.info("Added Stable Atom:" + integerTreeSetEntry.getKey() + ' ' + integerTreeSetEntry.getValue().first() + ' ' + stableAtoms.get(integerTreeSetEntry.getKey()).getMass());
-                }
-            }
-            for (Map.Entry<Integer, TreeMap<Double, Integer>> integerTreeMapEntry : mostStableUnstableIsotopes.entrySet()) {
-                unstableAtoms.put(integerTreeMapEntry.getKey(), new dAtomDefinition(
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_p, integerTreeMapEntry.getKey()),
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_n, integerTreeMapEntry.getValue().lastEntry().getValue()),
-                        new cElementalDefinitionStack(eLeptonDefinition.lepton_e, integerTreeMapEntry.getKey())));
-                if (DEBUG_MODE) {
-                    TecTech.LOGGER.info("Added Unstable Atom:" + integerTreeMapEntry.getKey() + ' ' + integerTreeMapEntry.getValue().lastEntry().getValue() + ' ' + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass());
-                }
-            }
-            deuterium=new dAtomDefinition(
-                    dHadronDefinition.hadron_p1,
-                    dHadronDefinition.hadron_n1,
-                    eLeptonDefinition.lepton_e1).getStackForm(1);
-            tritium=new dAtomDefinition(
-                    dHadronDefinition.hadron_p1,
-                    dHadronDefinition.hadron_n2,
-                    eLeptonDefinition.lepton_e1).getStackForm(1);
-            helium_3=new dAtomDefinition(
-                    dHadronDefinition.hadron_p2,
-                    dHadronDefinition.hadron_n1,
-                    eLeptonDefinition.lepton_e2).getStackForm(1);
-            alpha = new dAtomDefinition(
-                    dHadronDefinition.hadron_p2,
-                    dHadronDefinition.hadron_n2).getStackForm(1);
-            beryllium_8=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 4),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 4),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 4)).getStackForm(1);
-            carbon_14=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 6),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 8),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 6)).getStackForm(1);
-            neon_24=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 10),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 14),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 10)).getStackForm(1);
-            silicon_34=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 14),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 20),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 14)).getStackForm(1);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, dAtomDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)64);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + 64);
-        }
-    }
-
-    public static void setTransformation(){
-        /*----STABLE ATOMS----**/
-        refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
-
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
-
-        /*----UNSTABLE ATOMS----**/
-        refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
-
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
-
-        try {
-            dAtomDefinition temp;
-            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(deuterium.definition, AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
-
-            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(tritium.definition, AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
-
-            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(helium_3.definition, AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
-
-            temp=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 146)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
-
-            double tempMass=temp.getMass();
-
-            temp=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 143)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
-
-            TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
-
-            temp=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 145)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
-
-            somethingHeavy=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 147)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
-
-            TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
-
-            TecTech.LOGGER.info("Neutron Mass: "+dHadronDefinition.hadron_n.getMass());
-
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-
-        if(Loader.isModLoaded(Reference.GTPLUSPLUS)) {
-            new GtppAtomLoader().run();
-        }
-    }
-
-    public static dAtomDefinition getFirstStableIsotope(int element) {
-        return stableAtoms.get(element);
-    }
-
-    public static dAtomDefinition getBestUnstableIsotope(int element) {
-        return unstableAtoms.get(element);
-    }
-
-    @Override
-    public byte getClassType() {
-        return 64;
-    }
-
-    public static byte getClassTypeStatic(){
-        return 64;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getName());
-            lines.add("SYMBOL = "+getSymbol());
-        }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){
-            for(int i=1;i<iaea.energeticStatesArray.length;i++){
-                lines.add("E LEVEL "+i+" = "+iaea.energeticStatesArray[i].energy+" eV");
-            }
-        }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    At current energy level");
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
deleted file mode 100644
index aa0951d98c..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.*;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
-import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
-import com.github.technus.tectech.util.Util;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition.getNbtTagCompound;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static gregtech.api.enums.OrePrefixes.dust;
-
-/**
- * Created by danie_000 on 17.11.2016.
- */
-public final class dHadronDefinition extends cElementalDefinition {//TODO Optimize map i/o
-    private final int hash;
-
-    private static final byte nbtType = (byte) 'h';
-    //Helpers
-    public static final Map<dHadronDefinition,String> SYMBOL_MAP =new HashMap<>();
-    public static final Map<dHadronDefinition,String> NAME_MAP =new HashMap<>();
-    public static dHadronDefinition hadron_p, hadron_n, hadron_p_, hadron_n_;
-    public static cElementalDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3, hadron_p5;
-    private static double protonMass = 0D;
-    private static double neutronMass = 0D;
-    private static final double actualProtonMass=938272081.3D;
-    private static final double actualNeutronMass=939565413.3D;
-
-    //float-mass in eV/c^2
-    public final double mass;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    public final int charge;
-    public final double rawLifeTime;
-    public final int amount;
-    //generation max present inside - minus if contains any antiquark
-    public final byte type;
-    //private final FluidStack fluidThing;
-    //private final ItemStack itemThing;
-
-    private final cElementalConstantStackMap quarkStacks;
-
-    public dHadronDefinition(cElementalDefinitionStack... quarks) throws tElementalException {
-        this(true, new cElementalConstantStackMap(quarks));
-    }
-
-    private dHadronDefinition(boolean check, cElementalDefinitionStack... quarks) throws tElementalException {
-        this(check, new cElementalConstantStackMap(quarks));
-    }
-
-    public dHadronDefinition(cElementalConstantStackMap quarks) throws tElementalException {
-        this(true, quarks);
-    }
-
-    private dHadronDefinition(boolean check, cElementalConstantStackMap quarks) throws tElementalException {
-        if (check && !canTheyBeTogether(quarks)) {
-            throw new tElementalException("Hadron Definition error");
-        }
-        quarkStacks = quarks;
-
-        int amount = 0;
-        int charge = 0;
-        int type = 0;
-        boolean containsAnti = false;
-        double mass = 0;
-        for (cElementalDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
-            amount += quarkStack.amount;
-            if((int)quarkStack.amount!=quarkStack.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            mass += quarkStack.getMass();
-            charge += quarkStack.getCharge();
-            type = Math.max(Math.abs(quarkStack.definition.getType()), type);
-            if (quarkStack.definition.getType() < 0) {
-                containsAnti = true;
-            }
-        }
-        this.amount = amount;
-        this.charge = charge;
-        this.type = containsAnti ? (byte) -type : (byte) type;
-        long mult = this.amount * this.amount * (this.amount - 1);
-        mass = mass * 5.543D * mult;//yes it becomes heavier
-
-        if (mass == protonMass && this.amount == 3) {
-            rawLifeTime = iElementalDefinition.STABLE_RAW_LIFE_TIME;
-            mass=actualProtonMass;
-        } else if (mass == neutronMass && this.amount == 3) {
-            rawLifeTime = 882D;
-            mass=actualNeutronMass;
-        } else {
-            if (this.amount == 3) {
-                rawLifeTime = 1.34D / mass * Math.pow(9.81, charge);
-            } else if (this.amount == 2) {
-                rawLifeTime = 1.21D / mass / Math.pow(19.80, charge);
-            } else {
-                rawLifeTime = 1.21D / mass / Math.pow(9.80, charge);
-            }
-        }
-        this.mass=mass;
-        hash=super.hashCode();
-    }
-
-    //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
-        long amount = 0;
-        for (cElementalDefinitionStack quarks : stacks.valuesToArray()) {
-            if (!(quarks.definition instanceof eQuarkDefinition)) {
-                return false;
-            }
-            if((int)quarks.amount!=quarks.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            amount += quarks.amount;
-        }
-        return amount >= 2 && amount <= 12;
-    }
-
-    @Override
-    public String getName() {
-        StringBuilder name= new StringBuilder(getSimpleName());
-        name.append(':');
-        String sym= NAME_MAP.get(this);
-        if(sym!=null){
-            name.append(' ').append(sym);
-        }else {
-            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
-                name.append(' ').append(quark.definition.getSymbol()).append((int)quark.amount);
-            }
-        }
-        return name.toString();
-    }
-
-    private String getSimpleName() {
-        switch (amount) {
-            case 2:
-                return "Meson";
-            case 3:
-                return "Baryon";
-            case 4:
-                return "Tetraquark";
-            case 5:
-                return "Pentaquark";
-            case 6:
-                return "Hexaquark";
-            default:
-                return "Hadron";
-        }
-    }
-
-    @Override
-    public String getSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
-            return sym;
-        }else {
-            StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
-                for (int i = 0; i < quark.amount; i++) {
-                    symbol.append(quark.definition.getSymbol());
-                }
-            }
-            return symbol.toString();
-        }
-    }
-
-    @Override
-    public String getShortSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
-            return sym;
-        }else {
-            StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
-                for (int i = 0; i < quark.amount; i++) {
-                    symbol.append(quark.definition.getShortSymbol());
-                }
-            }
-            return symbol.toString();
-        }
-    }
-
-    @Override
-    public byte getColor() {
-        return -7;
-    }
-
-    @Override
-    public cElementalConstantStackMap getSubParticles() {
-        return quarkStacks;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
-            return cElementalDecay.noProduct;
-        }
-        ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<>();
-        for (cElementalDefinitionStack quarks : quarkStacks) {
-            if (quarks.definition.getType() == 1 || quarks.definition.getType() == -1) {
-                //covers both quarks and antiquarks
-                decaysInto.add(quarks);
-            } else {
-                //covers both quarks and antiquarks
-                decaysInto.add(new cElementalDefinitionStack(boson_Y__, 2));
-            }
-        }
-        return new cElementalDecay[]{
-                new cElementalDecay(0.75D, decaysInto.toArray(new cElementalDefinitionStack[0])),
-                eBosonDefinition.deadEnd
-        };
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
-            return cElementalDecay.noProduct;
-        }
-        return new cElementalDecay[]{new cElementalDecay(0.75D, quarkStacks), eBosonDefinition.deadEnd}; //decay into quarks
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (amount == 2 && quarkStacks.length == 2 &&
-                quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() &&
-                quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
-            return cElementalDecay.noProduct;
-        } else if (amount != 3) {
-            return new cElementalDecay[]{new cElementalDecay(0.95D, quarkStacks), eBosonDefinition.deadEnd}; //decay into quarks
-        } else {
-            ArrayList<eQuarkDefinition> newBaryon = new ArrayList<>();
-            iElementalDefinition[] Particles = new iElementalDefinition[2];
-            for (cElementalDefinitionStack quarks : quarkStacks) {
-                for (int i = 0; i < quarks.amount; i++) {
-                    newBaryon.add((eQuarkDefinition) quarks.definition);
-                }
-            }
-            //remove last
-            eQuarkDefinition lastQuark = newBaryon.remove(2);
-
-            cElementalDefinitionStack[] decay;
-            if (Math.abs(lastQuark.getType()) > 1) {
-                decay = lastQuark.getDecayArray()[1].outputStacks.valuesToArray();
-            } else {
-                decay = lastQuark.getDecayArray()[2].outputStacks.valuesToArray();
-            }
-            newBaryon.add((eQuarkDefinition) decay[0].definition);
-            Particles[0] = decay[1].definition;
-            Particles[1] = decay[2].definition;
-
-            cElementalDefinitionStack[] contentOfBaryon = newBaryon.stream()
-                    .map(eQuarkDefinition -> new cElementalDefinitionStack(eQuarkDefinition,1))
-                    .toArray(cElementalDefinitionStack[]::new);
-
-            try {
-                return new cElementalDecay[]{
-                        new cElementalDecay(0.001D, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__),
-                        new cElementalDecay(0.99D, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
-                        eBosonDefinition.deadEnd};
-            } catch (tElementalException e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return new cElementalDecay[]{eBosonDefinition.deadEnd};
-            }
-        }
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return rawLifeTime;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    //@Override
-    //public iElementalDefinition getAnti() {
-    //    cElementalDefinitionStack[] stacks = this.quarkStacks.values();
-    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
-    //    for (int i = 0; i < antiElements.length; i++) {
-    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
-    //    }
-    //    try {
-    //        return new dHadronDefinition(false, antiElements);
-    //    } catch (tElementalException e) {
-    //        if (DEBUG_MODE) e.printStackTrace();
-    //        return null;
-    //    }
-    //}
-
-    @Override
-    public iElementalDefinition getAnti() {
-        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
-        for (cElementalDefinitionStack stack : quarkStacks.valuesToArray()) {
-            anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
-        }
-        try {
-            return new dHadronDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, quarkStacks);
-    }
-
-    public static dHadronDefinition fromNBT(NBTTagCompound nbt) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new dHadronDefinition(stacks);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    public static void run() {
-        try {
-            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
-            protonMass = hadron_p.mass;
-            //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
-            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
-            SYMBOL_MAP.put(hadron_p,"p");
-            NAME_MAP.put(hadron_p,"Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
-            hadron_p_ = (dHadronDefinition) hadron_p.getAnti();
-            SYMBOL_MAP.put(hadron_p_,"~p");
-            NAME_MAP.put(hadron_p_,"Anti Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
-            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
-            neutronMass = hadron_n.mass;
-            //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
-            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
-            SYMBOL_MAP.put(hadron_n, "n");
-            NAME_MAP.put(hadron_n, "Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
-            hadron_n_ = (dHadronDefinition) hadron_n.getAnti();
-            SYMBOL_MAP.put(hadron_n_,"~n");
-            NAME_MAP.put(hadron_n_,"Anti Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n_);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            protonMass = -1;
-            neutronMass = -1;
-        }
-        hadron_p1 = new cElementalDefinitionStack(hadron_p, 1D);
-        hadron_n1 = new cElementalDefinitionStack(hadron_n, 1D);
-        hadron_p2 = new cElementalDefinitionStack(hadron_p, 2D);
-        hadron_n2 = new cElementalDefinitionStack(hadron_n, 2D);
-        hadron_p3 = new cElementalDefinitionStack(hadron_p, 3D);
-        hadron_n3 = new cElementalDefinitionStack(hadron_n, 3D);
-        hadron_p5 = new cElementalDefinitionStack(hadron_p, 5D);
-
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, dHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + -64);
-        }
-    }
-
-    public static void setTransformations(){
-        //Added to atom map, but should be in its own
-        cElementalDefinitionStack neutrons=new cElementalDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
-        TRANSFORMATION_INFO.oredictDequantization.put(neutrons.definition,new aOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
-        TRANSFORMATION_INFO.oredictQuantization.put(
-                OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
-                new aOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
-        );
-    }
-
-    @Override
-    public byte getClassType() {
-        return -64;
-    }
-
-    public static byte getClassTypeStatic(){
-        return -64;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getSimpleName());
-            //lines.add("SYMBOL = "+getSymbol());
-        }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java
deleted file mode 100644
index 8b09bfd2e0..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.util.Util.splitButDifferent;
-
-public final class iaeaNuclide {
-    public static final double AMU_TO_EV_DIV_C_C=9.31494061E08D,MICRO_AMU_TO_EV_DIV_C_C=9.31494061E02D;
-
-    //Nuclide			 T1/2 	 T1/2 [s]	 Decay Modes		  ? 	 Q 	 Q?-	 Q?	 QEC	 Q?- n	 Sn	 Sp	 Binding/A	 Atomic Mass	 Mass Excess	 Discovery
-    //Abund. [mole fract.]		 BR [%]		[?N]	[barn]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[? AMU]	[keV]
-
-    //Z,N,symb,radius, unc, energy, unc, jp, half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quad , unc,Qb-,unc,Qb- n,unc,Qa, unc, Qec, unc,Sn,unc, Sp,unc,Binding/A,unc,atomic mass, unc, mass excess,unc,
-    //Z,N,symbol,energy , unc, jp,half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quadrupole , unc,
-    private static final HashMap<Integer,iaeaNuclide> NUCLIDES=new HashMap<>();
-
-    public static void run(){
-        String line="";
-
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("nuclides.csv")));
-            ArrayList<String[]> blockOfData=new ArrayList<>(4);
-            while((line=reader.readLine())!=null) {
-                String[] split= splitButDifferent(line,",");
-                if(split.length!=19) {
-                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclides database " + line);
-                }
-                if(!split[1].isEmpty() && !blockOfData.isEmpty()) {
-                    new iaeaNuclide(blockOfData.toArray(new String[blockOfData.size()][]));
-                    blockOfData.clear();
-                }
-                blockOfData.add(split);
-            }
-            if(!blockOfData.isEmpty()) {
-                new iaeaNuclide(blockOfData.toArray(new String[blockOfData.size()][]));
-                blockOfData.clear();
-            }
-            reader.close();
-        }catch (Exception e){
-            System.out.println(line);
-            e.printStackTrace();
-        }
-
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("nuclidesTable.csv")));
-            while((line=reader.readLine())!=null) {
-                String[] split= splitButDifferent(line,",");
-                if(split.length!=47) {
-                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclidesTable database " + line);
-                }
-                get(Integer.parseInt(split[0]),Integer.parseInt(split[1])).getMoreData(split);
-            }
-            reader.close();
-        }catch (Exception e){
-            System.out.println(line);
-            e.printStackTrace();
-        }
-
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("energyLevels.csv")));
-            while((line=reader.readLine())!=null) {
-                String[] split= splitButDifferent(line,",");
-                if(split.length!=27) {
-                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA energyLevels database " + line);
-                }
-                new energeticState(split);
-            }
-            reader.close();
-        }catch (Exception e){
-            System.out.println(line);
-            e.printStackTrace();
-        }
-
-        for(iaeaNuclide nuclide:NUCLIDES.values()) {
-            nuclide.makeArrayOfEnergyStates();
-        }
-    }
-
-    public static iaeaNuclide get(int protons, int neutrons){
-        return NUCLIDES.get((protons<<16)+neutrons);
-    }
-
-    public final short N,Z;
-    public final double halfTime;//sec
-    public final double mass;//eV/c^2
-    public final short discovery;//year
-    private TreeMap<Double,energeticState> energeticStates;
-    public energeticState[] energeticStatesArray;
-
-
-    private iaeaNuclide(String[][] rows){
-        N=Short.parseShort(rows[1][2]);
-        Z=Short.parseShort(rows[1][0]);
-        NUCLIDES.put(((int)Z <<16)+N,this);
-
-        String[] parts = splitButDifferent(rows[0][16], "|");
-        double Mass=doubleOrNaN(parts[0],"mass");
-        if(!Double.isNaN(Mass)) {
-            //System.out.println("Mass =\t" + Mass+"\t"+(N+Z)+"\t"+N+"\t"+Z+"\t"+(Mass/(N+Z)));
-            mass = Mass* MICRO_AMU_TO_EV_DIV_C_C;
-        }
-        else {
-            mass = Double.NaN;
-        }
-
-        discovery=(short)doubleOrNaN(rows[0][18],"discovery");
-
-        if(rows[0][3].contains("STABLE")){
-            halfTime = STABLE_RAW_LIFE_TIME;
-        }else{
-            parts = splitButDifferent(rows[0][4], "|");
-            halfTime = doubleOrNaN(parts[0],"half life");
-        }
-    }
-
-    private void getMoreData(String[] cells){
-        //if(DEBUG_MODE) {
-        //    if (add(cells[14])) System.out.println(N + " " + Z);
-        //    if (add(cells[17])) System.out.println(N + " " + Z);
-        //    if (add(cells[20])) System.out.println(N + " " + Z);
-        //}
-        new energeticState(this, halfTime, getDecaysFixed(
-                cells[14],
-                doubleOrNaN(cells[15],"chance1"),
-                cells[17],
-                doubleOrNaN(cells[18],"chance1"),
-                cells[20],
-                doubleOrNaN(cells[21],"chance1")));
-    }
-
-    private static final energeticState[] empty=new energeticState[0];
-    private void makeArrayOfEnergyStates(){
-        if(energeticStates==null || energeticStates.isEmpty()) {
-            energeticStatesArray = empty;
-        } else {
-            energeticStatesArray = energeticStates.values().toArray(new energeticState[0]);
-            double life=halfTime;
-            for (energeticState energeticState : energeticStatesArray) {
-                if(Double.isNaN(energeticState.Thalf)){
-                    energeticState.Thalf=life;
-                }else {
-                    life=energeticState.Thalf;
-                }
-            }
-        }
-    }
-
-    private double doubleOrNaN(String s, String name){
-        s=s.replaceAll("#","");
-        if(!s.isEmpty()) {
-            try {
-                double value=Double.parseDouble(s);
-                if(Double.isNaN(value)) {
-                    return Double.NaN;
-                }
-                return value != 0 ?value:Double.NaN;
-            } catch (Exception e) {
-                System.out.println("Invalid Value " + name + ' ' + N + ' ' + Z + ' ' + s);
-                e.printStackTrace();
-            }
-        }
-        return Double.NaN;
-    }
-
-    public static final class energeticState{
-        public final double energy;
-        public double Thalf;
-        public final iaeaDecay[] decaymodes;
-
-        private energeticState(iaeaNuclide nuclide,double Thalf,iaeaDecay[] decaymodes){
-            energy=0;
-            this.Thalf=Thalf;
-            this.decaymodes=decaymodes;
-            if(nuclide.energeticStates==null) {
-                nuclide.energeticStates = new TreeMap<>();
-            }
-            nuclide.energeticStates.put(energy,this);
-        }
-
-        private energeticState(String[] cells){
-            iaeaNuclide nuclide= get((int)doubleOrNaN(cells[0],"protons"),(int)doubleOrNaN(cells[1],"neutrons"));
-            if(nuclide==null) {
-                throw new Error("Missing nuclide " + (int) doubleOrNaN(cells[0], "protons") + ' ' + (int) doubleOrNaN(cells[1], "neutrons"));
-            }
-            energy =doubleOrNaN(cells[3],"energy level",nuclide)*1000D;//to eV
-            if(energy<0) {
-                throw new Error("Invalid energy " + nuclide.N + ' ' + nuclide.Z + ' ' + cells[3]);
-            }
-            Thalf =doubleOrNaN(cells[10],"half life",nuclide);
-            if(nuclide.energeticStates==null) {
-                new Exception("Should be initialized before doing this... "+ nuclide.N + ' ' +nuclide.Z).printStackTrace();
-                nuclide.energeticStates = new TreeMap<>();
-            }
-            nuclide.energeticStates.put(energy,this);
-            //if(DEBUG_MODE) {
-            //    if (add(cells[12])) System.out.println(nuclide.N + " " + nuclide.Z);
-            //    if (add(cells[15])) System.out.println(nuclide.N + " " + nuclide.Z);
-            //    if (add(cells[18])) System.out.println(nuclide.N + " " + nuclide.Z);
-            //}
-            decaymodes = getDecaysFixed(
-                    cells[12],
-                    doubleOrNaN(cells[13],"chance 1",nuclide),
-                    cells[15],
-                    doubleOrNaN(cells[16],"chance 2",nuclide),
-                    cells[18],
-                    doubleOrNaN(cells[19],"chance 3",nuclide));
-        }
-
-        private double doubleOrNaN(String s, String name){
-            return doubleOrNaN(s,name,null);
-        }
-
-        private double doubleOrNaN(String s, String name, iaeaNuclide nuclide){
-            s = s.replaceAll("#", "");
-            if (!s.isEmpty()) {
-                try {
-                    return Double.parseDouble(s);
-                } catch (Exception e) {
-                    if(nuclide==null){
-                        System.out.println("Invalid Value " + name + ' ' + s);
-                    }else {
-                        System.out.println("Invalid Value " + name + ' ' + nuclide.N + ' ' + nuclide.Z + ' ' + s);
-                    }
-                    e.printStackTrace();
-                }
-            }
-            return Double.NaN;
-        }
-    }
-
-    private static HashSet<String> decays=new HashSet<>();
-    private static boolean add(String s){
-        if(decays.add(s)){
-            System.out.println(s);
-            return true;
-        }
-        return false;
-    }
-
-    private static iaeaDecay[] getDecaysFixed(String decay1, double chance1,String decay2, double chance2,String decay3, double chance3){
-        boolean do1,do2,do3;
-        do1= !decay1.isEmpty() && !Double.isNaN(chance1);
-        do2= !decay2.isEmpty() && !Double.isNaN(chance2);
-        do3= !decay3.isEmpty() && !Double.isNaN(chance3);
-        TreeMap<Double,iaeaDecay> decays=new TreeMap<>();
-        if(do1 && do2 && chance1==100 && chance2==100 && chance3!=100){
-            decays.put(1D, new iaeaDecay(1D, decay1));
-            if(do3) {
-                chance3/=100d;
-                decays.put(chance3, new iaeaDecay(chance3, decay2));
-                chance2=1d-chance3;
-            }
-            chance2/=2d;
-            decays.put(chance2, new iaeaDecay(chance2, decay2));
-        }else if(do1 && chance1==100){
-            decays.put(1D, new iaeaDecay(1D, decay1));
-            if(do2) {
-                chance2/=100d;
-                decays.put(chance2, new iaeaDecay(chance2, decay2));
-            }
-            if(do3) {
-                chance3 /= 100d;
-                if(do2) {
-                    chance3 *= chance2;
-                }
-                decays.put(chance3, new iaeaDecay(chance3, decay3));
-            }
-        }else{
-            double normalization= (do1?chance1:0) + (do2?chance2:0) + (do3?chance3:0);
-            if(do1) {
-                chance1/=normalization;
-                decays.put(chance1, new iaeaDecay(chance1, decay1));
-            }
-            if(do2) {
-                chance2/=normalization;
-                decays.put(chance2, new iaeaDecay(chance2, decay2));
-            }
-            if(do3) {
-                chance3/=normalization;
-                decays.put(chance3, new iaeaDecay(chance3, decay3));
-            }
-            if(do1||do2||do3) {
-                decays.put(1D, iaeaDecay.DEAD_END);
-            }
-        }
-        //if(DEBUG_MODE){
-        //    System.out.println("INVALID SUM?\t"+normalization+"\t"+decay1+"\t"+chance1+"\t"+decay2+"\t"+chance2+"\t"+decay3+"\t"+chance3);
-        //}
-        return decays.values().toArray(new iaeaDecay[0]);
-    }
-
-    public static final class iaeaDecay{
-        public final double chance;
-        public final String decayName;
-        public static final iaeaDecay DEAD_END=new iaeaDecay(1D,"DEAD_END");
-        private iaeaDecay(double chance,String decayName){
-            this.chance=chance;
-            this.decayName=decayName;
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
new file mode 100644
index 0000000000..e3efa3b7e6
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -0,0 +1,45 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMBosonDefinition extends EMPrimitive {
+    public static final EMBosonDefinition
+            boson_Y__ = new EMBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
+            boson_H__ = new EMBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
+    //deadEnd
+    public static final EMDecay                   deadEnd     = new EMDecay(boson_Y__, boson_Y__);
+    public static final EMDecay           deadEndHalf = new EMDecay(boson_Y__);
+    public static final EMDefinitionStack boson_Y__1  =new EMDefinitionStack(boson_Y__,1);
+
+    private EMBosonDefinition(String name, String symbol, double mass, int color, int ID) {
+        super(name, symbol, 0, mass, 0, color, ID);
+    }
+
+    public static void run() {
+        boson_Y__.init(null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        boson_H__.init(null, 1.56e-22D, 2, 2,
+                new EMDecay(0.01D, quark_b, quark_b_),
+                new EMDecay(0.02D, lepton_t, lepton_t_),
+                new EMDecay(0.96D, new EMDefinitionStack(boson_Y__, 4)),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Boson: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return this==boson_H__;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
new file mode 100644
index 0000000000..98bdf7ca5c
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -0,0 +1,69 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMLeptonDefinition extends EMPrimitive {
+    public static final EMLeptonDefinition
+            lepton_e = new EMLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
+            lepton_m = new EMLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
+            lepton_t = new EMLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19),
+            lepton_e_ = new EMLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6D, 3, 16),
+            lepton_m_ = new EMLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18),
+            lepton_t_ = new EMLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20);
+
+    public static final EMDefinitionStack lepton_e1  = new EMDefinitionStack(lepton_e, 1);
+    public static final EMDefinitionStack lepton_e2  = new EMDefinitionStack(lepton_e, 2);
+    public static final EMDefinitionStack lepton_e_1 = new EMDefinitionStack(lepton_e_, 1);
+    public static final EMDefinitionStack lepton_e_2 = new EMDefinitionStack(lepton_e_, 2);
+
+    private EMLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
+        super(name, symbol, type, mass, charge, -1, ID);
+        //this.itemThing=null;
+        //this.fluidThing=null;
+    }
+
+    public static void run() {
+        lepton_e.init(lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
+                deadEnd,
+                new EMDecay(lepton_e,boson_Y__));
+        lepton_m.init(lepton_m_, 2.197019e-6D, 0, 1,
+                new EMDecay(0.9D, lepton_e, lepton_Ve_, lepton_Vm),
+                deadEnd);//makes photons and don't care
+        lepton_t.init(lepton_t_, 2.906e-13D, 1, 3,
+                new EMDecay(0.05F, lepton_m, lepton_Vm_, lepton_Vt, boson_H__),
+                new EMDecay(0.1D, lepton_e, lepton_Ve_, lepton_Vm),
+                new EMDecay(0.8D, lepton_m, lepton_Vm_, lepton_Vt, boson_Y__),
+                deadEnd);//makes photons and don't care
+
+        lepton_e_.init(lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
+                deadEnd,
+                new EMDecay(lepton_e,boson_Y__));
+        lepton_m_.init(lepton_m, 2.197019e-6F, 0, 1,
+                new EMDecay(0.9F, lepton_e_, lepton_Ve, lepton_Vm_),
+                deadEnd);//makes photons and don't care
+        lepton_t_.init(lepton_t, 2.906e-13F, 1, 3,
+                new EMDecay(0.05F, lepton_m_, lepton_Vm, lepton_Vt_, boson_H__),
+                new EMDecay(0.1F, lepton_e_, lepton_Ve, lepton_Vm_),
+                new EMDecay(0.8F, lepton_m_, lepton_Vm, lepton_Vt_, boson_Y__),
+                deadEnd);//makes photons and don't care
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Lepton: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
new file mode 100644
index 0000000000..e77c74ed89
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -0,0 +1,59 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMNeutrinoDefinition extends EMPrimitive {
+    public static final EMNeutrinoDefinition
+            lepton_Ve = new EMNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
+            lepton_Vm = new EMNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
+            lepton_Vt = new EMNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6D, 25),
+            lepton_Ve_ = new EMNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0D, 22),
+            lepton_Vm_ = new EMNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24),
+            lepton_Vt_ = new EMNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6D, 26);
+
+    public static final EMDefinitionStack lepton_Ve1  = new EMDefinitionStack(lepton_Ve, 1);
+    public static final EMDefinitionStack lepton_Ve2  = new EMDefinitionStack(lepton_Ve, 2);
+    public static final EMDefinitionStack lepton_Ve_1 = new EMDefinitionStack(lepton_Ve_, 1);
+    public static final EMDefinitionStack lepton_Ve_2 = new EMDefinitionStack(lepton_Ve_, 2);
+
+    private EMNeutrinoDefinition(String name, String symbol, int type, double mass, int ID) {
+        super(name, symbol, type, mass, 0, -1, ID);
+    }
+
+    public static void run() {
+        lepton_Ve.init(lepton_Ve_, 1D, -1, -1,
+                EMDecay.NO_PRODUCT);
+        lepton_Vm.init(lepton_Vm_, 1D, 1, 0,
+                new EMDecay(0.825D, nothing),
+                deadEndHalf);
+        lepton_Vt.init(lepton_Vt_, 1, 1, 0,
+                new EMDecay(0.75F, nothing),
+                deadEnd);
+
+        lepton_Ve_.init(lepton_Ve, 1, -1, -1,
+                EMDecay.NO_PRODUCT);
+        lepton_Vm_.init(lepton_Vm, 1, 1, 0,
+                new EMDecay(0.825F, nothing),
+                deadEndHalf);
+        lepton_Vt_.init(lepton_Vt, 1, 1, 0,
+                new EMDecay(0.75F, nothing),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Lepton: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
new file mode 100644
index 0000000000..68591cc4e6
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -0,0 +1,39 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMPrimitiveDefinition extends EMPrimitive {
+    public static final EMPrimitiveDefinition
+            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, Integer.MIN_VALUE+10_000),
+            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MAX_VALUE-10_000),
+            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, 0),
+            magic = new EMPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
+            magic_ = new EMPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
+
+    private EMPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID) {
+        super(name, symbol, type, mass, 0, color, ID);
+    }
+
+    public static void run() {
+        nbtE__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        null__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        space__.init(space__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        magic.init(magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        magic_.init(magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Primitive: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
new file mode 100644
index 0000000000..b0a5c419e1
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -0,0 +1,106 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMQuarkDefinition extends EMPrimitive {
+    public static final EMQuarkDefinition
+            quark_u = new EMQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
+            quark_c = new EMQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
+            quark_t = new EMQuarkDefinition("Top", "t", 3, 172.44e9D, 2, 13),
+            quark_d = new EMQuarkDefinition("Down", "d", 1, 4.8e6D, -1, 5),
+            quark_s = new EMQuarkDefinition("Strange", "s", 2, 95e6D, -1, 7),
+            quark_b = new EMQuarkDefinition("Bottom", "b", 3, 4.65e9D, -1, 11),
+            quark_u_ = new EMQuarkDefinition("AntiUp", "~u", -1, 2.3e6D, -2, 4),
+            quark_c_ = new EMQuarkDefinition("AntiCharm", "~c", -2, 1.29e9D, -2, 10),
+            quark_t_ = new EMQuarkDefinition("AntiTop", "~t", -3, 172.44e9D, -2, 14),
+            quark_d_ = new EMQuarkDefinition("AntiDown", "~d", -1, 4.8e6D, 1, 6),
+            quark_s_ = new EMQuarkDefinition("AntiStrange", "~s", -2, 95e6D, 1, 8),
+            quark_b_ = new EMQuarkDefinition("AntiBottom", "~b", -3, 4.65e9D, 1, 12);
+
+    private EMQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
+        super(name, symbol, type, mass, charge, 0, ID);
+    }
+
+    public static void run() {
+        quark_u.init(quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(1.23201e-5D, quark_b/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.050778116D, quark_s/*,lepton_m_,lepton_Vm*/),
+                new EMDecay(0.9D, quark_d, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_c.init(quark_c_, 0.5e-13D, 1, -1,
+                new EMDecay(0.00169744D, quark_b/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.05071504D, quark_d, lepton_m_, lepton_Vm),
+                new EMDecay(0.9D, quark_s, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_t.init(quark_t_, 2.5e-26D, 0, -1,
+                new EMDecay(7.51689e-5D, quark_d, lepton_t_, lepton_Vt),
+                new EMDecay(0.00163216D, quark_s, lepton_m_, lepton_Vm),
+                new EMDecay(0.9D, quark_b, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+
+        quark_d.init(quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(7.51689e-5D, quark_t/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.05071504D, quark_c/*,lepton_m,lepton_Vm_*/),
+                new EMDecay(0.9D, quark_u, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_s.init(quark_s_, 0.6e-9D, 1, -1,
+                new EMDecay(0.00163216D, quark_t/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.050778116D, quark_u, lepton_m, lepton_Vm_),
+                new EMDecay(0.9D, quark_c, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_b.init(quark_b_, 0.7e-13D, 0, -1,
+                new EMDecay(1.23201e-5D, quark_u, lepton_t, lepton_Vt_),
+                new EMDecay(0.00169744D, quark_c, lepton_m, lepton_Vm_),
+                new EMDecay(0.9D, quark_t, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+
+        quark_u_.init(quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(1.23201e-5D, quark_b_/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.050778116D, quark_s_/*,lepton_m,lepton_Vm_*/),
+                new EMDecay(0.9D, quark_d_, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_c_.init(quark_c, 0.5e-13D, 1, -1,
+                new EMDecay(0.00169744F, quark_b_/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.05071504F, quark_d_, lepton_m, lepton_Vm_),
+                new EMDecay(0.9F, quark_s_, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_t_.init(quark_t, 2.5e-26F, 0, -1,
+                new EMDecay(7.51689e-5F, quark_d_, lepton_t, lepton_Vt_),
+                new EMDecay(0.00163216F, quark_s_, lepton_m, lepton_Vm_),
+                new EMDecay(0.9F, quark_b_, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+
+        quark_d_.init(quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(7.51689e-5F, quark_t_/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.05071504F, quark_c_/*,lepton_m_,lepton_Vm*/),
+                new EMDecay(0.9F, quark_u_, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_s_.init(quark_s, 0.6e-9F, 1, -1,
+                new EMDecay(0.00163216F, quark_t_/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.050778116F, quark_u_, lepton_m_, lepton_Vm),
+                new EMDecay(0.9F, quark_c_, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_b_.init(quark_b, 0.7e-13F, 0, -1,
+                new EMDecay(1.23201e-5F, quark_u_, lepton_t_, lepton_Vt),
+                new EMDecay(0.00169744F, quark_c_, lepton_m_, lepton_Vm),
+                new EMDecay(0.9F, quark_t_, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Quark: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
deleted file mode 100644
index 8096743b78..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cPrimitiveDefinition extends cElementalPrimitive {
-    public static final cPrimitiveDefinition
-            nbtE__ = new cPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, Integer.MIN_VALUE+10_000),
-            null__ = new cPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MAX_VALUE-10_000),
-            space__ = new cPrimitiveDefinition("Space", "_", 0, 0D, -4, 0),
-            magic = new cPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
-            magic_ = new cPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
-
-    private cPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID) {
-        super(name, symbol, type, mass, 0, color, ID);
-    }
-
-    public static void run() {
-        nbtE__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        null__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        space__.init(space__, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        magic.init(magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        magic_.init(magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-    }
-
-    @Override
-    public String getName() {
-        return "Primitive: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
deleted file mode 100644
index e87df806d3..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eBosonDefinition extends cElementalPrimitive {
-    public static final eBosonDefinition
-            boson_Y__ = new eBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
-            boson_H__ = new eBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
-    //deadEnd
-    public static final cElementalDecay deadEnd = new cElementalDecay(boson_Y__, boson_Y__);
-    public static final cElementalDecay deadEndHalf = new cElementalDecay(boson_Y__);
-    public static final cElementalDefinitionStack boson_Y__1=new cElementalDefinitionStack(boson_Y__,1);
-
-    private eBosonDefinition(String name, String symbol, double mass, int color, int ID) {
-        super(name, symbol, 0, mass, 0, color, ID);
-    }
-
-    public static void run() {
-        boson_Y__.init(null, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        boson_H__.init(null, 1.56e-22D, 2, 2,
-                new cElementalDecay(0.01D, quark_b, quark_b_),
-                new cElementalDecay(0.02D, lepton_t, lepton_t_),
-                new cElementalDecay(0.96D, new cElementalDefinitionStack(boson_Y__, 4)),
-                deadEnd);
-    }
-
-    @Override
-    public String getName() {
-        return "Boson: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return this==boson_H__;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
deleted file mode 100644
index c8e3b07f02..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eNeutrinoDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eLeptonDefinition extends cElementalPrimitive {
-    public static final eLeptonDefinition
-            lepton_e = new eLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
-            lepton_m = new eLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
-            lepton_t = new eLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19),
-            lepton_e_ = new eLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6D, 3, 16),
-            lepton_m_ = new eLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18),
-            lepton_t_ = new eLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20);
-
-    public static final cElementalDefinitionStack lepton_e1 = new cElementalDefinitionStack(lepton_e, 1);
-    public static final cElementalDefinitionStack lepton_e2 = new cElementalDefinitionStack(lepton_e, 2);
-    public static final cElementalDefinitionStack lepton_e_1 = new cElementalDefinitionStack(lepton_e_, 1);
-    public static final cElementalDefinitionStack lepton_e_2 = new cElementalDefinitionStack(lepton_e_, 2);
-
-    private eLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, -1, ID);
-        //this.itemThing=null;
-        //this.fluidThing=null;
-    }
-
-    public static void run() {
-        lepton_e.init(lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
-                deadEnd,
-                new cElementalDecay(lepton_e,boson_Y__));
-        lepton_m.init(lepton_m_, 2.197019e-6D, 0, 1,
-                new cElementalDecay(0.9D, lepton_e, lepton_Ve_, lepton_Vm),
-                deadEnd);//makes photons and don't care
-        lepton_t.init(lepton_t_, 2.906e-13D, 1, 3,
-                new cElementalDecay(0.05F, lepton_m, lepton_Vm_, lepton_Vt, boson_H__),
-                new cElementalDecay(0.1D, lepton_e, lepton_Ve_, lepton_Vm),
-                new cElementalDecay(0.8D, lepton_m, lepton_Vm_, lepton_Vt, boson_Y__),
-                deadEnd);//makes photons and don't care
-
-        lepton_e_.init(lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
-                deadEnd,
-                new cElementalDecay(lepton_e,boson_Y__));
-        lepton_m_.init(lepton_m, 2.197019e-6F, 0, 1,
-                new cElementalDecay(0.9F, lepton_e_, lepton_Ve, lepton_Vm_),
-                deadEnd);//makes photons and don't care
-        lepton_t_.init(lepton_t, 2.906e-13F, 1, 3,
-                new cElementalDecay(0.05F, lepton_m_, lepton_Vm, lepton_Vt_, boson_H__),
-                new cElementalDecay(0.1F, lepton_e_, lepton_Ve, lepton_Vm_),
-                new cElementalDecay(0.8F, lepton_m_, lepton_Vm, lepton_Vt_, boson_Y__),
-                deadEnd);//makes photons and don't care
-    }
-
-    @Override
-    public String getName() {
-        return "Lepton: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
deleted file mode 100644
index 0f0725d208..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eNeutrinoDefinition extends cElementalPrimitive {
-    public static final eNeutrinoDefinition
-            lepton_Ve = new eNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
-            lepton_Vm = new eNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
-            lepton_Vt = new eNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6D, 25),
-            lepton_Ve_ = new eNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0D, 22),
-            lepton_Vm_ = new eNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24),
-            lepton_Vt_ = new eNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6D, 26);
-
-    public static final cElementalDefinitionStack lepton_Ve1 = new cElementalDefinitionStack(lepton_Ve, 1);
-    public static final cElementalDefinitionStack lepton_Ve2 = new cElementalDefinitionStack(lepton_Ve, 2);
-    public static final cElementalDefinitionStack lepton_Ve_1 = new cElementalDefinitionStack(lepton_Ve_, 1);
-    public static final cElementalDefinitionStack lepton_Ve_2 = new cElementalDefinitionStack(lepton_Ve_, 2);
-
-    private eNeutrinoDefinition(String name, String symbol, int type, double mass, int ID) {
-        super(name, symbol, type, mass, 0, -1, ID);
-    }
-
-    public static void run() {
-        lepton_Ve.init(lepton_Ve_, 1D, -1, -1,
-                cElementalDecay.noProduct);
-        lepton_Vm.init(lepton_Vm_, 1D, 1, 0,
-                new cElementalDecay(0.825D, nothing),
-                deadEndHalf);
-        lepton_Vt.init(lepton_Vt_, 1, 1, 0,
-                new cElementalDecay(0.75F, nothing),
-                deadEnd);
-
-        lepton_Ve_.init(lepton_Ve, 1, -1, -1,
-                cElementalDecay.noProduct);
-        lepton_Vm_.init(lepton_Vm, 1, 1, 0,
-                new cElementalDecay(0.825F, nothing),
-                deadEndHalf);
-        lepton_Vt_.init(lepton_Vt, 1, 1, 0,
-                new cElementalDecay(0.75F, nothing),
-                deadEnd);
-    }
-
-    @Override
-    public String getName() {
-        return "Lepton: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
deleted file mode 100644
index 798066466b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eNeutrinoDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eQuarkDefinition extends cElementalPrimitive {
-    public static final eQuarkDefinition
-            quark_u = new eQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
-            quark_c = new eQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
-            quark_t = new eQuarkDefinition("Top", "t", 3, 172.44e9D, 2, 13),
-            quark_d = new eQuarkDefinition("Down", "d", 1, 4.8e6D, -1, 5),
-            quark_s = new eQuarkDefinition("Strange", "s", 2, 95e6D, -1, 7),
-            quark_b = new eQuarkDefinition("Bottom", "b", 3, 4.65e9D, -1, 11),
-            quark_u_ = new eQuarkDefinition("AntiUp", "~u", -1, 2.3e6D, -2, 4),
-            quark_c_ = new eQuarkDefinition("AntiCharm", "~c", -2, 1.29e9D, -2, 10),
-            quark_t_ = new eQuarkDefinition("AntiTop", "~t", -3, 172.44e9D, -2, 14),
-            quark_d_ = new eQuarkDefinition("AntiDown", "~d", -1, 4.8e6D, 1, 6),
-            quark_s_ = new eQuarkDefinition("AntiStrange", "~s", -2, 95e6D, 1, 8),
-            quark_b_ = new eQuarkDefinition("AntiBottom", "~b", -3, 4.65e9D, 1, 12);
-
-    private eQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, 0, ID);
-    }
-
-    public static void run() {
-        quark_u.init(quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(1.23201e-5D, quark_b/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.050778116D, quark_s/*,lepton_m_,lepton_Vm*/),
-                new cElementalDecay(0.9D, quark_d, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c.init(quark_c_, 0.5e-13D, 1, -1,
-                new cElementalDecay(0.00169744D, quark_b/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.05071504D, quark_d, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9D, quark_s, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t.init(quark_t_, 2.5e-26D, 0, -1,
-                new cElementalDecay(7.51689e-5D, quark_d, lepton_t_, lepton_Vt),
-                new cElementalDecay(0.00163216D, quark_s, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9D, quark_b, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-
-        quark_d.init(quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(7.51689e-5D, quark_t/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.05071504D, quark_c/*,lepton_m,lepton_Vm_*/),
-                new cElementalDecay(0.9D, quark_u, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s.init(quark_s_, 0.6e-9D, 1, -1,
-                new cElementalDecay(0.00163216D, quark_t/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.050778116D, quark_u, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9D, quark_c, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b.init(quark_b_, 0.7e-13D, 0, -1,
-                new cElementalDecay(1.23201e-5D, quark_u, lepton_t, lepton_Vt_),
-                new cElementalDecay(0.00169744D, quark_c, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9D, quark_t, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-
-        quark_u_.init(quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(1.23201e-5D, quark_b_/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.050778116D, quark_s_/*,lepton_m,lepton_Vm_*/),
-                new cElementalDecay(0.9D, quark_d_, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c_.init(quark_c, 0.5e-13D, 1, -1,
-                new cElementalDecay(0.00169744F, quark_b_/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.05071504F, quark_d_, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9F, quark_s_, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t_.init(quark_t, 2.5e-26F, 0, -1,
-                new cElementalDecay(7.51689e-5F, quark_d_, lepton_t, lepton_Vt_),
-                new cElementalDecay(0.00163216F, quark_s_, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9F, quark_b_, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-
-        quark_d_.init(quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(7.51689e-5F, quark_t_/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.05071504F, quark_c_/*,lepton_m_,lepton_Vm*/),
-                new cElementalDecay(0.9F, quark_u_, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s_.init(quark_s, 0.6e-9F, 1, -1,
-                new cElementalDecay(0.00163216F, quark_t_/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.050778116F, quark_u_, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9F, quark_c_, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b_.init(quark_b, 0.7e-13F, 0, -1,
-                new cElementalDecay(1.23201e-5F, quark_u_, lepton_t_, lepton_Vt),
-                new cElementalDecay(0.00169744F, quark_c_, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9F, quark_t_, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-    }
-
-    @Override
-    public String getName() {
-        return "Quark: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index 05f251924e..f5cfad22f3 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,9 +1,11 @@
 package com.github.technus.tectech.recipe;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.item.ItemStack;
@@ -17,16 +19,16 @@ import java.util.HashSet;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 
 public class TT_recipe extends GT_Recipe {
-    public static final String                E_RECIPE_ID = "eRecipeID";
-    public final cElementalConstantStackMap[] input;
-    public final cElementalConstantStackMap[] output;
-    public final cElementalConstantStackMap[] eCatalyst;
-    public final IAdditionalCheck             additionalCheck;
+    public static final String        E_RECIPE_ID = "eRecipeID";
+    public final EMConstantStackMap[]             input;
+    public final IEMMapRead<? extends IEMStack>[] output;
+    public final EMConstantStackMap[]             eCatalyst;
+    public final IAdditionalCheck     additionalCheck;
 
     public TT_recipe(boolean aOptimize,
                      ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
                      FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue,
-                     cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check){
+                     EMConstantStackMap[] in, IEMMapRead<? extends IEMStack>[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check){
         super(aOptimize,aInputs,aOutputs,aSpecialItems,aChances,aFluidInputs,aFluidOutputs,aDuration,aEUt,aSpecialValue);
         input=in;
         output=out;
@@ -38,11 +40,11 @@ public class TT_recipe extends GT_Recipe {
         return EMisRecipeInputEqual(consume,doNotCheckStackSizes,itemStacks,fluidStacks,null,null);
     }
 
-    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap[] in){
+    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap[] in){
         return EMisRecipeInputEqual(consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,null);
     }
     
-    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap[] in, cElementalInstanceStackMap[] catalyst) {
+    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap[] in, EMInstanceStackMap[] catalyst) {
         if(additionalCheck !=null && !additionalCheck.check(this,consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,catalyst)) {
             return false;
         }
@@ -51,7 +53,7 @@ public class TT_recipe extends GT_Recipe {
                 for (int i = 0; i < eCatalyst.length; i++) {
                     if (eCatalyst[i] != null && eCatalyst[i].hasStacks()) {
                         if (catalyst[i] != null && catalyst[i].hasStacks()) {
-                            if (!catalyst[i].removeAllAmounts(true, eCatalyst[i])) {
+                            if (!catalyst[i].containsAllAmounts(eCatalyst[i])) {
                                 return false;
                             }
                         } else {
@@ -68,8 +70,14 @@ public class TT_recipe extends GT_Recipe {
                 for (int i = 0; i < input.length; i++) {
                     if (input[i] != null && input[i].hasStacks()) {
                         if (in[i] != null && in[i].hasStacks()) {
-                            if (!in[i].removeAllAmounts(consume, input[i])) {
-                                return false;
+                            if(consume){
+                                if (!in[i].removeAllAmounts(input[i])) {
+                                    return false;
+                                }
+                            }else {
+                                if (!in[i].containsAllAmounts(input[i])) {
+                                    return false;
+                                }
                             }
                         } else {
                             return false;
@@ -83,11 +91,13 @@ public class TT_recipe extends GT_Recipe {
         return super.isRecipeInputEqual(consume, doNotCheckStackSizes, fluidStacks, itemStacks);
     }
 
-    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap in){
+    @Deprecated
+    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in){
         return EMisRecipeInputEqualConsumeFromOne(consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,null);
     }
 
-    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap in, cElementalInstanceStackMap[] catalyst) {
+    @Deprecated
+    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in, EMInstanceStackMap[] catalyst) {
         if(additionalCheck !=null && !additionalCheck.check(this,consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,catalyst)) {
             return false;
         }
@@ -96,7 +106,7 @@ public class TT_recipe extends GT_Recipe {
                 for (int i = 0; i < eCatalyst.length; i++) {
                     if (eCatalyst[i] != null && eCatalyst[i].hasStacks()) {
                         if (catalyst[i] != null && catalyst[i].hasStacks()) {
-                            if (!catalyst[i].removeAllAmounts(true, eCatalyst[i])) {
+                            if (!catalyst[i].containsAllAmounts(eCatalyst[i])) {
                                 return false;
                             }
                         } else {
@@ -110,11 +120,17 @@ public class TT_recipe extends GT_Recipe {
         }
         if (input != null) {
             if (in != null) {
-                for (cElementalConstantStackMap anInput : input) {
+                for (EMConstantStackMap anInput : input) {
                     if (anInput != null && anInput.hasStacks()) {
                         if (in.hasStacks()) {
-                            if (!in.removeAllAmounts(consume, anInput)) {
-                                return false;
+                            if(consume){
+                                if (!in.removeAllAmounts(anInput)) {
+                                    return false;
+                                }
+                            }else {
+                                if (!in.containsAllAmounts(anInput)) {
+                                    return false;
+                                }
                             }
                         } else {
                             return false;
@@ -129,8 +145,8 @@ public class TT_recipe extends GT_Recipe {
     }
     
     public interface IAdditionalCheck {
-        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap[] in, cElementalInstanceStackMap[] e);
-        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap in, cElementalInstanceStackMap[] e);
+        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap[] in, EMInstanceStackMap[] e);
+        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in, EMInstanceStackMap[] e);
     }
 
     public static class TT_Recipe_Map<T extends TT_recipe> {
@@ -166,12 +182,20 @@ public class TT_recipe extends GT_Recipe {
     }
 
     public static class GT_Recipe_MapTT extends GT_Recipe.GT_Recipe_Map {
-        public static GT_Recipe_MapTT sResearchableFakeRecipes =new GT_Recipe_MapTT(new HashSet<>(32), "gt.recipe.researchStation", "Research station", null, "gregtech:textures/gui/multimachines/ResearchFake", 1, 1,1,0,1,"", 1, "", true, false);//nei to false - using custom handler
-        public static GT_Recipe_MapTT sScannableFakeRecipes = new GT_Recipe_MapTT(new HashSet<>(32),"gt.recipe.em_scanner","EM Scanner Research", null,"gregtech:textures/gui/multimachines/ResearchFake",1,1,1,0,1,"",1,"",true,false);
-        public static ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes=new ArrayList<>();
+        public static GT_Recipe_MapTT                   sResearchableFakeRecipes = new GT_Recipe_MapTT(new HashSet<>(32), "gt.recipe.researchStation", "Research station", null, "gregtech:textures/gui/multimachines/ResearchFake", 1, 1, 1, 0, 1, "", 1, "", true, false);//nei to false - using custom handler
+        public static GT_Recipe_MapTT                   sScannableFakeRecipes    = new GT_Recipe_MapTT(new HashSet<>(32), "gt.recipe.em_scanner", "EM Scanner Research", null, "gregtech:textures/gui/multimachines/ResearchFake", 1, 1, 1, 0, 1, "", 1, "", true, false);
+        public static ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes     = new ArrayList<>();
 
-        public GT_Recipe_MapTT(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
-            super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
+        public GT_Recipe_MapTT(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName, String aNEIGUIPath,
+                               int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, int aMinimalInputFluids,
+                               int aAmperage,
+                               String aNEISpecialValuePre, int aNEISpecialValueMultiplier, String aNEISpecialValuePost,
+                               boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
+            super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath,
+                    aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids,
+                    aAmperage,
+                    aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost,
+                    aShowVoltageAmperageInNEI, aNEIAllowed);
         }
     }
 
@@ -181,7 +205,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
+                                EMConstantStackMap[] in, EMConstantStackMap[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchItem=researchItem;
         }
@@ -189,28 +213,28 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalConstantStackMap[] in) {
+                                EMConstantStackMap[] in) {
             this(aOptimize, researchItem, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
 
     public static class TT_EMRecipe extends TT_recipe{
-        public final iElementalDefinition mResearchEM;
-        public final GT_Recipe scannerRecipe;
+        public final IEMDefinition mResearchEM;
+        public final GT_Recipe     scannerRecipe;
 
-        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
+        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, IEMDefinition researchEM,
                            ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                            FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                           cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
+                           EMConstantStackMap[] in, EMConstantStackMap[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchEM=researchEM;
             this.scannerRecipe=scannerRecipe;
         }
 
-        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
+        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, IEMDefinition researchEM,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalConstantStackMap[] in) {
+                                EMConstantStackMap[] in) {
             this(aOptimize, scannerRecipe, researchEM, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
@@ -219,8 +243,8 @@ public class TT_recipe extends GT_Recipe {
         public static TT_Recipe_Map_EM<TT_EMRecipe> sCrafterRecipesEM = new TT_Recipe_Map_EM<>("EM Crafter Recipes","gt.recipe.em_crafter",null);
         public static TT_Recipe_Map_EM<TT_EMRecipe> sMachineRecipesEM = new TT_Recipe_Map_EM<>("EM Machinert Recipe","gt.recipe.em_machinery",null);
 
-        private final HashMap<iElementalDefinition,T> mRecipeMap;
-        public final String mNEIName,mUnlocalizedName,mNEIGUIPath;
+        private final HashMap<IEMDefinition,T> mRecipeMap;
+        public final String                    mNEIName,mUnlocalizedName,mNEIGUIPath;
 
         public TT_Recipe_Map_EM(String mNEIName,String mUnlocalizedName,String mNEIGUIPath){
             mRecipeMap =new HashMap<>(16);
@@ -229,7 +253,7 @@ public class TT_recipe extends GT_Recipe {
             this.mNEIGUIPath=mNEIGUIPath;
         }
 
-        public T findRecipe(iElementalDefinition stack){
+        public T findRecipe(IEMDefinition stack){
             return mRecipeMap.get(stack);
         }
 
@@ -238,7 +262,7 @@ public class TT_recipe extends GT_Recipe {
                 return null;
             }
             try {
-                return mRecipeMap.get(cElementalDefinition.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
+                return mRecipeMap.get(EMComplex.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
             }catch (Exception e){
                 if (DEBUG_MODE) {
                     e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index 93d6f4ea2b..bb18c16727 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.recipe;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting;
@@ -131,7 +131,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMmachineRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, EMConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -165,7 +165,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMcrafterRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            EMConstantStackMap[] eInputs, EMConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchItem==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -187,8 +187,8 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
     }
 
     public static boolean addScannableEMmachineRecipe(
-            iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
+            IEMDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, EMConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -215,7 +215,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new EMConstantStackMap(new EMDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_machine.machine)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,aInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 aFluidInputs,machineDuration,machineEUt,machineAmperage,eInputs));
@@ -223,8 +223,8 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
     }
 
     public static boolean addScannableEMcrafterRecipe(
-            iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            IEMDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
+            EMConstantStackMap[] eInputs, EMConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchEM==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -240,7 +240,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new EMConstantStackMap(new EMDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_crafting.crafter)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,null,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 null,crafterDuration,crafterEUt,crafterAmperage,eInputs,null,catalyst,check));
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index b1f6d8887b..107cb97103 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -3,11 +3,11 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -31,7 +31,7 @@ import java.util.TreeSet;
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -39,7 +39,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  * Created by Tec on 15.03.2017.
  */
 public final class DebugElementalInstanceContainer_EM extends Item implements IElementalItem {
-    public static final TreeSet<iElementalDefinition> STACKS_REGISTERED =new TreeSet<>();
+    public static final TreeSet<IEMDefinition> STACKS_REGISTERED =new TreeSet<>();
 
     public static DebugElementalInstanceContainer_EM INSTANCE;
 
@@ -58,23 +58,23 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
             aStack.stackSize = 1;
             if (tTileEntity instanceof IGregTechTileEntity) {
                 IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-                if (metaTE instanceof iElementalContainer) {
-                    cElementalInstanceStackMap content = ((iElementalContainer) metaTE).getContentHandler();
+                if (metaTE instanceof IEMContainer) {
+                    EMInstanceStackMap content = ((IEMContainer) metaTE).getContentHandler();
                     if (tNBT.hasKey("content")) {
                         try {
-                            content.putUnifyAll(cElementalInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
-                        } catch (tElementalException e) {
+                            content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+                        } catch (EMException e) {
                             if (DEBUG_MODE) {
                                 e.printStackTrace();
                             }
                             return true;
                         }
-                        ((iElementalContainer) metaTE).purgeOverflow();
+                        ((IEMContainer) metaTE).purgeOverflow();
                         tNBT.removeTag("content");
                         tNBT.removeTag("symbols");
                         tNBT.removeTag("info");
                     } else if (content.hasStacks()) {
-                        ((iElementalContainer) metaTE).purgeOverflow();
+                        ((IEMContainer) metaTE).purgeOverflow();
                         tNBT.setTag("info", content.getInfoNBT());
                         tNBT.setTag("content", content.toNBT());
                         tNBT.setTag("symbols", content.getShortSymbolsNBT());
@@ -87,7 +87,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         return aPlayer instanceof EntityPlayerMP;
     }
 
-    public ItemStack setContent(ItemStack aStack,cElementalInstanceStackMap content){
+    public ItemStack setContent(ItemStack aStack, EMInstanceStackMap content){
         NBTTagCompound tNBT = aStack.getTagCompound();
         if(tNBT==null){
             tNBT=new NBTTagCompound();
@@ -95,8 +95,8 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         }
         if (tNBT.hasKey("content")) {
             try {
-                content.putUnifyAll(cElementalInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
-            } catch (tElementalException e) {
+                content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+            } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
@@ -141,10 +141,10 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         ItemStack that = new ItemStack(this, 1);
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
-        for(iElementalDefinition definition: STACKS_REGISTERED){
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 144 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_144))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1000 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
+        for(IEMDefinition definition: STACKS_REGISTERED){
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 144 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_144))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1000 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index 2513bdf8bf..2cca6474f4 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -38,18 +38,18 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
     }
 
     //return previous thing
-    public static cElementalConstantStackMap setContent(ItemStack containerItem, cElementalConstantStackMap definitions){
+    public static EMConstantStackMap setContent(ItemStack containerItem, EMConstantStackMap definitions){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM) {
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 tNBT = containerItem.stackTagCompound = new NBTTagCompound();
             }
 
-            cElementalConstantStackMap oldMap =null;
+            EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
-                } catch (tElementalException e) {
+                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
                     }
@@ -63,7 +63,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalConstantStackMap getContent(ItemStack containerItem){
+    public static EMConstantStackMap getContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
 
@@ -71,8 +71,8 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 return null;
             }
             try {
-                return cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
-            } catch (tElementalException e) {
+                return EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+            } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
@@ -81,18 +81,18 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalConstantStackMap clearContent(ItemStack containerItem){
+    public static EMConstantStackMap clearContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 return null;
             }
 
-            cElementalConstantStackMap oldMap =null;
+            EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
-                } catch (tElementalException e) {
+                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
                     }
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index e43feb2351..e517fe5f2a 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -44,7 +44,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item implements IEl
     }
 
     //return previous thing
-    public static void setContent(ItemStack containerItem, cElementalInstanceStackMap definitions, int[] detailsOnDepthLevels){
+    public static void setContent(ItemStack containerItem, EMInstanceStackMap definitions, int[] detailsOnDepthLevels){
         if(containerItem.getItem() instanceof ElementalDefinitionScanStorage_EM) {
             if (containerItem.stackTagCompound == null) {
                 containerItem.stackTagCompound = new NBTTagCompound();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index d25a0c62ed..0950a173ab 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToElementalPipe;
 import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.relauncher.Side;
@@ -24,7 +24,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 import static com.github.technus.tectech.util.CommonValues.*;
 import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
@@ -34,16 +34,16 @@ import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 /**
  * Created by danie_000 on 11.12.2016.
  */
-public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements iElementalContainer, IConnectsToElementalPipe {
+public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements IEMContainer, IConnectsToElementalPipe {
     private static Textures.BlockIcons.CustomIcon EM_T_SIDES;
     private static Textures.BlockIcons.CustomIcon EM_T_ACTIVE;
     private static Textures.BlockIcons.CustomIcon EM_T_CONN;
 
     private String clientLocale = "en_US";
 
-    protected cElementalInstanceStackMap content = new cElementalInstanceStackMap();
+    protected EMInstanceStackMap content      = new EMInstanceStackMap();
     //float lifeTimeMult=1f;
-    public int postEnergize = 0;
+    public    int                postEnergize = 0;
     public double overflowMatter = 0f;
     public short id = -1;
     private byte deathDelay = 2;
@@ -95,13 +95,13 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         overflowMatter = aNBT.getFloat("overflowMatter")+aNBT.getDouble("OverflowMatter");
         id = aNBT.getShort("eID");
         try {
-            content = cElementalInstanceStackMap.fromNBT(aNBT.getCompoundTag("eM_Stacks"));
-        } catch (tElementalException e) {
+            content = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eM_Stacks"));
+        } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
             if (content == null) {
-                content = new cElementalInstanceStackMap();
+                content = new EMInstanceStackMap();
             }
         }
     }
@@ -165,7 +165,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     @Override
-    public cElementalInstanceStackMap getContentHandler() {
+    public EMInstanceStackMap getContentHandler() {
         return content;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index a61bf27fe3..4a0bb55784 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -1,17 +1,17 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
 import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
 import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -38,7 +38,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import java.util.HashMap;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
@@ -61,9 +61,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     private static double MASS_TO_EU_INSTANT;
     private static int STARTUP_COST, KEEPUP_COST;
 
-    protected byte eTier = 0;
-    protected cElementalInstanceStack stack;
-    private long plasmaEnergy;
+    protected byte            eTier = 0;
+    protected EMInstanceStack stack;
+    private   long            plasmaEnergy;
 
     protected boolean started = false;
     //endregion
@@ -73,7 +73,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
 
     public interface IPrimitiveColliderHandler {
-        void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out);
+        void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out);
     }
 
     public interface IColliderHandler extends IPrimitiveColliderHandler {
@@ -81,23 +81,23 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     static {
-        FUSE_HANDLERS.put((dAtomDefinition.getClassTypeStatic() << 16) | dAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | EMAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnifyAll(in2.definition.getSubParticles());
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -106,27 +106,27 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 return 1;
             }
         });
-        registerSimpleAtomFuse(dHadronDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(dComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(cElementalPrimitive.getClassTypeStatic());
+        registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMPrimitive.getClassTypeStatic());
 
-        FUSE_HANDLERS.put((dHadronDefinition.getClassTypeStatic() << 16) | dHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnifyAll(in2.definition.getSubParticles());
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -135,23 +135,23 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 return 2;
             }
         });
-        FUSE_HANDLERS.put((dHadronDefinition.getClassTypeStatic() << 16) | cElementalPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnify(in2.definition.getStackForm(1));
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -161,13 +161,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             }
         });
 
-        registerSimpleAspectFuse(dComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAspectFuse(cElementalPrimitive.getClassTypeStatic());
+        registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAspectFuse(EMPrimitive.getClassTypeStatic());
 
-        FUSE_HANDLERS.put((cElementalPrimitive.getClassTypeStatic() << 16) | cElementalPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMPrimitive.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
-                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.definition.getClass().getName() + '\0' + in2.definition.getClass().getName());
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
                 if (collisionHandler != null) {
                     collisionHandler.collide(in2, in1, out);
                 } else {
@@ -181,40 +181,40 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             }
         });
 
-        PRIMITIVE_FUSE_HANDLERS.put(eQuarkDefinition.class.getName() + '\0' + eQuarkDefinition.class.getName(), (in1, in2, out) -> {
+        PRIMITIVE_FUSE_HANDLERS.put(EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> {
             try {
-                cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                defs.putUnify(in1.definition.getStackForm(1));
-                defs.putUnify(in2.definition.getStackForm(1));
-                dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
+                EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+                defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
             } catch (Exception e) {
                 out.putUnifyAll(in1, in2);
                 return;
             }
-            if (in1.amount > in2.amount) {
-                out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-            } else if (in2.amount > in1.amount) {
-                out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
             }
         });
-        PRIMITIVE_FUSE_HANDLERS.put(ePrimalAspectDefinition.class.getName() + '\0' + ePrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
+        PRIMITIVE_FUSE_HANDLERS.put(EMPrimalAspectDefinition.class.getName() + '\0' + EMPrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
             if (fuseAspects(in1, in2, out)) return;
-            if (in1.amount > in2.amount) {
-                out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-            } else if (in2.amount > in1.amount) {
-                out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
             }
         });
     }
 
-    private static boolean fuseAspects(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+    private static boolean fuseAspects(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
         try {
-            cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-            defs.putUnify(in1.definition.getStackForm(1));
-            defs.putUnify(in2.definition.getStackForm(1));
-            dComplexAspectDefinition aspect = new dComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-            out.putUnify(new cElementalInstanceStack(aspect, Math.min(in1.amount, in2.amount)));
+            EMDefinitionStackMap defs = new EMDefinitionStackMap();
+            defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+            defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+            EMComplexAspectDefinition aspect = new EMComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+            out.putUnify(new EMInstanceStack(aspect, Math.min(in1.getAmount(), in2.getAmount())));
         } catch (Exception e) {
             out.putUnifyAll(in1, in2);
             return true;
@@ -223,14 +223,14 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     private static void registerSimpleAspectFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((dComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+        FUSE_HANDLERS.put((EMComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 if (fuseAspects(in1, in2, out)) return;
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -242,23 +242,23 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     private static void registerSimpleAtomFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((dAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnify(in2.definition.getStackForm(1));
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -378,27 +378,27 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     protected double fuse(GT_MetaTileEntity_EM_collider partner) {///CAN MAKE EU
         if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            boolean check = stack.definition.fusionMakesEnergy(stack.getEnergy()) &&
-                    partner.stack.definition.fusionMakesEnergy(partner.stack.getEnergy());
+            boolean check = stack.getDefinition().fusionMakesEnergy(stack.getEnergy()) &&
+                    partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
 
-            cElementalInstanceStack stack2 = partner.stack;
-            double preMass = add(stack2.getMass(),stack.getMass());
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = add(stack2.getMass(),stack.getMass());
             //System.out.println("preMass = " + preMass);
 
-            cElementalInstanceStackMap map = new cElementalInstanceStackMap();
-            IColliderHandler colliderHandler;
-            if (stack2.definition.getClassType() > stack.definition.getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.definition.getClassType() << 16) | stack.definition.getClassType());
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.definition.getClassType() << 16) | stack2.definition.getClassType());
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             }
-            for (cElementalInstanceStack newStack : map.valuesToArray()) {
-                check &= newStack.definition.fusionMakesEnergy(newStack.getEnergy());
+            for (EMInstanceStack newStack : map.valuesToArray()) {
+                check &= newStack.getDefinition().fusionMakesEnergy(newStack.getEnergy());
             }
             //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new cElementalInstanceStackMap[]{map};
+            outputEM = new EMInstanceStackMap[]{map};
 
             partner.stack = stack = null;
             //System.out.println("check = " + check);
@@ -410,21 +410,21 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     protected double collide(GT_MetaTileEntity_EM_collider partner) {//DOES NOT MAKE EU!
         if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            cElementalInstanceStack stack2 = partner.stack;
-            double preMass = stack2.getMass() + stack.getMass();
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = stack2.getMass() + stack.getMass();
             //System.out.println("preMass = " + preMass);
 
-            cElementalInstanceStackMap map = new cElementalInstanceStackMap();
-            IColliderHandler colliderHandler;
-            if (stack2.definition.getClassType() > stack.definition.getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.definition.getClassType() << 16) | stack.definition.getClassType());
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.definition.getClassType() << 16) | stack2.definition.getClassType());
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             }
             //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new cElementalInstanceStackMap[]{map};
+            outputEM = new EMInstanceStackMap[]{map};
 
             partner.stack = stack = null;
             //System.out.println("check = " + check);
@@ -434,12 +434,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         return 0;
     }
 
-    private boolean handleRecipe(cElementalInstanceStack stack2, cElementalInstanceStackMap map, IColliderHandler colliderHandler) {
+    private boolean handleRecipe(EMInstanceStack stack2, EMInstanceStackMap map, IColliderHandler colliderHandler) {
         if (colliderHandler != null && eTier >= colliderHandler.getRequiredTier()) {
             colliderHandler.collide(stack2, stack, map);
         } else {
             map.putUnifyAll(stack, stack2);
-            outputEM = new cElementalInstanceStackMap[]{map};
+            outputEM = new EMInstanceStackMap[]{map};
             return true;
         }
         return false;
@@ -472,16 +472,17 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         }
     }
 
-    private cElementalInstanceStackMap tickStack() {
+    private EMInstanceStackMap tickStack() {
         if (stack == null) {
             return null;
         }
-        cElementalDecayResult newInstances = stack.decay(1, stack.age += 1, 0);
+        stack.setAge(stack.getAge() + 1);
+        EMDecayResult newInstances = stack.decay(1, stack.getAge(), 0);
         if (newInstances == null) {
             stack.nextColor();
             return null;
         } else {
-            stack = newInstances.getOutput().remove(newInstances.getOutput().getLast().definition);
+            stack = newInstances.getOutput().removeKey(newInstances.getOutput().getLast().getDefinition());
             return newInstances.getOutput();
         }
     }
@@ -525,12 +526,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         if (started) {
             if (stack == null) {
                 for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
-                    cElementalInstanceStackMap container = inputElemental.getContentHandler();
+                    EMInstanceStackMap container = inputElemental.getContentHandler();
                     if (container.isEmpty()) {
                         continue;
                     }
-                    stack = container.remove(container.getFirst().definition);
-                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / dAtomDefinition.getSomethingHeavy().getMass())) / 2;
+                    stack = container.removeKey(container.getFirst().getDefinition());
+                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / EMAtomDefinition.getSomethingHeavy().getMass())) / 2;
                     if (eut < Integer.MIN_VALUE + 7) {
                         return false;
                     }
@@ -575,12 +576,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                     collide(partner);//todo
                     break;
                 default: {
-                    outputEM = new cElementalInstanceStackMap[2];
+                    outputEM = new EMInstanceStackMap[2];
                     outputEM[1] = tickStack();
                     if (outputEM[1] == null) {
                         outputEM[1] = partner.tickStack();
                     } else {
-                        cElementalInstanceStackMap map = partner.tickStack();
+                        EMInstanceStackMap map = partner.tickStack();
                         if (map != null) {
                             outputEM[1].putUnifyAll(map);
                         }
@@ -659,7 +660,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         eTier = aNBT.getByte("eTier");//collider tier
         started = aNBT.getBoolean("eStarted");
         if (aNBT.hasKey("eStack")) {
-            stack = cElementalInstanceStack.fromNBT(aNBT.getCompoundTag("eStack"));
+            stack = EMInstanceStack.fromNBT(aNBT.getCompoundTag("eStack"));
         }
         plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index ed245b0e97..84dafb8db2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
@@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
-        cElementalInstanceStackMap map = getInputsClone_EM();
+        EMInstanceStackMap map = getInputsClone_EM();
         if (map != null && map.hasStacks()) {
             for (GT_MetaTileEntity_Hatch_InputElemental i : eInputHatches) {
                 i.getContentHandler().clear();
@@ -125,20 +125,20 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
         return false;
     }
 
-    private boolean startRecipe(cElementalInstanceStackMap input) {
+    private boolean startRecipe(EMInstanceStackMap input) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
-        outputEM = new cElementalInstanceStackMap[2];
+        outputEM = new EMInstanceStackMap[2];
         outputEM[0] = input;
-        outputEM[1] = new cElementalInstanceStackMap();
+        outputEM[1] = new EMInstanceStackMap();
 
-        for (cElementalInstanceStack stack : outputEM[0].valuesToArray()) {
-            if (stack.getEnergy() == 0 && stack.definition.decayMakesEnergy(1) &&
+        for (EMInstanceStack stack : outputEM[0].valuesToArray()) {
+            if (stack.getEnergy() == 0 && stack.getDefinition().decayMakesEnergy(1) &&
                     getBaseMetaTileEntity().decreaseStoredEnergyUnits(
                             (long) (stack.getEnergySettingCost(1) * URANIUM_MASS_TO_EU_INSTANT), false)) {
                 stack.setEnergy(1);
-            } else if (!stack.definition.decayMakesEnergy(stack.getEnergy())) {
-                outputEM[0].remove(stack.definition);
+            } else if (!stack.getDefinition().decayMakesEnergy(stack.getEnergy())) {
+                outputEM[0].removeKey(stack.getDefinition());
                 outputEM[1].putReplace(stack);
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 208219cd59..466f82071b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -26,9 +26,9 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refMass;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -72,7 +72,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         super(aName);
     }
 
-    private void startRecipe(iElementalStack from, long energy) {
+    private void startRecipe(IEMStack from, long energy) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = from.getMass();
@@ -98,12 +98,12 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-            cElementalInstanceStackMap map = in.getContentHandler();
-            for (cElementalInstanceStack stack : map.valuesToArray()) {
+            EMInstanceStackMap map = in.getContentHandler();
+            for (EMInstanceStack stack : map.valuesToArray()) {
                 {
-                    aFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
+                    EMFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
                     if (info != null) {
-                        if (map.removeAllAmounts(false, info.input())) {
+                        if (map.removeAllAmounts(info.input())) {
                             mOutputFluids = new FluidStack[]{info.output()};
                             startRecipe(info.input(), stack.getEnergy());
                             return true;
@@ -111,9 +111,9 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
                     }
                 }
                 {
-                    aItemDequantizationInfo info = stack.getDefinition().someAmountIntoItemsStack();
+                    EMItemDequantizationInfo info = stack.getDefinition().someAmountIntoItemsStack();
                     if (info != null) {
-                        if (map.removeAllAmounts(false, info.input())) {
+                        if (map.removeAllAmounts(info.input())) {
                             mOutputItems = new ItemStack[]{info.output()};
                             startRecipe(info.input(), stack.getEnergy());
                             return true;
@@ -121,10 +121,10 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
                     }
                 }
                 {
-                    aOredictDequantizationInfo info = stack.getDefinition().someAmountIntoOredictStack();
+                    EMOredictDequantizationInfo info = stack.getDefinition().someAmountIntoOredictStack();
                     if (info != null) {
-                        if (map.removeAllAmounts(false, info.input())) {
-                            ArrayList<ItemStack> items = OreDictionary.getOres(info.out);
+                        if (map.removeAllAmounts(info.input())) {
+                            ArrayList<ItemStack> items = OreDictionary.getOres(info.getOut());
                             if (items != null && !items.isEmpty()) {
                                 mOutputItems = new ItemStack[]{items.get(0)};
                                 startRecipe(info.input(), stack.getEnergy());
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index f5504eadc7..630569a25d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -3,12 +3,12 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictQuantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidQuantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemQuantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictQuantizationInfo;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -29,11 +29,11 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.DEFAULT_ENERGY_LEVEL;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refMass;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.DEFAULT_ENERGY_LEVEL;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullFluid;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
@@ -98,9 +98,9 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
-                    aItemQuantizationInfo aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, false, null));
+                    EMItemQuantizationInfo aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, false, null));
                     if (aIQI == null) {
-                        aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, true, null));//todo check if works?
+                        aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, true, null));//todo check if works?
                     }
                     if (aIQI == null) {
                         //ORE DICT quantization //todo fix for uranium?
@@ -109,12 +109,12 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (DEBUG_MODE) {
                                 TecTech.LOGGER.info("Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage() + ' ' + OreDictionary.getOreName(ID));
                             }
-                            aOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.oredictQuantization.get(ID);
+                            EMOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.getOredictQuantization().get(ID);
                             if (aOQI == null) {
                                 continue;
                             }
-                            iElementalStack into = aOQI.output();
-                            if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.amount, is.getItemDamage())}, null, inI)) {
+                            IEMStack into = aOQI.output();
+                            if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.getAmount(), is.getItemDamage())}, null, inI)) {
                                 startRecipe(into);
                                 return true;
                             }
@@ -124,7 +124,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                         if (DEBUG_MODE) {
                             TecTech.LOGGER.info("Quantifier-Item-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage());
                         }
-                        iElementalStack into = aIQI.output();
+                        IEMStack into = aIQI.output();
                         if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aIQI.input().stackSize, is.getItemDamage())}, null, inI)) {
                             startRecipe(into);
                             return true;
@@ -136,11 +136,11 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             FluidStack[] inF = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
-                    aFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.fluidQuantization.get(fs.getFluid().getID());
+                    EMFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.getFluidQuantization().get(fs.getFluid().getID());
                     if (aFQI == null) {
                         continue;
                     }
-                    iElementalStack into = aFQI.output();
+                    IEMStack into = aFQI.output();
                     if (into != null && fs.amount >= aFQI.input().amount && isInputEqual(true, false,
                             new FluidStack[]{aFQI.input()}, nullItem, inF, (ItemStack[]) null)) {
                         startRecipe(into);
@@ -152,7 +152,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         return false;
     }
 
-    private void startRecipe(iElementalStack into) {
+    private void startRecipe(IEMStack into) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = into.getMass();
@@ -163,10 +163,10 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         } else {
             mEUt = (int) -V[6];
         }
-        outputEM = new cElementalInstanceStackMap[]{
-                into instanceof cElementalInstanceStack ?
-                        new cElementalInstanceStackMap((cElementalInstanceStack) into) :
-                        new cElementalInstanceStackMap(new cElementalInstanceStack(into.getDefinition(), into.getAmount()))
+        outputEM = new EMInstanceStackMap[]{
+                into instanceof EMInstanceStack ?
+                        new EMInstanceStackMap((EMInstanceStack) into) :
+                        new EMInstanceStackMap(new EMInstanceStack(into.getDefinition(), into.getAmount()))
         };
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index d02088e805..74bb817142 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -2,10 +2,10 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.recipe.TT_recipe;
@@ -35,7 +35,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipe.E_RECIPE_ID;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
@@ -59,9 +59,9 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             SCAN_GET_COLOR = 256, SCAN_GET_AGE = 512, SCAN_GET_TIMESPAN_MULT = 1024, SCAN_GET_CLASS_TYPE = 2048;
 
     private TT_recipe.TT_EMRecipe.TT_EMRecipe eRecipe;
-    private cElementalDefinitionStack objectResearched;
-    private cElementalInstanceStackMap objectsScanned;
-    private String machineType;
+    private EMDefinitionStack                 objectResearched;
+    private EMInstanceStackMap                objectsScanned;
+    private String                    machineType;
     private long computationRemaining, computationRequired;
     private int[] scanComplexity;
 
@@ -219,31 +219,31 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     public boolean checkRecipe_EM(ItemStack itemStack) {
         eRecipe = null;
         if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContentHandler().hasStacks() && !eOutputHatches.isEmpty()) {
-            cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContentHandler();
+            EMInstanceStackMap researchEM = eInputHatches.get(0).getContentHandler();
             if (ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) {
                 GT_Recipe scannerRecipe = null;
-                for (cElementalInstanceStack stackEM : researchEM.valuesToArray()) {
+                for (EMInstanceStack stackEM : researchEM.valuesToArray()) {
                     objectsScanned = null;
-                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.definition);
+                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.getDefinition());
                     if (eRecipe != null) {
                         scannerRecipe = eRecipe.scannerRecipe;
                         machineType = machine;
-                        objectResearched = new cElementalDefinitionStack(stackEM.definition, 1);
+                        objectResearched = new EMDefinitionStack(stackEM.getDefinition(), 1);
                         //cleanMassEM_EM(objectResearched.getMass());
-                        researchEM.remove(objectResearched.definition);
+                        researchEM.removeKey(objectResearched.getDefinition());
                         break;
                     }
-                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(stackEM.definition);
+                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(stackEM.getDefinition());
                     if (eRecipe != null) {
                         scannerRecipe = eRecipe.scannerRecipe;
                         machineType = crafter;
-                        objectResearched = new cElementalDefinitionStack(stackEM.definition, 1);
+                        objectResearched = new EMDefinitionStack(stackEM.getDefinition(), 1);
                         //cleanMassEM_EM(objectResearched.getMass());
-                        researchEM.remove(objectResearched.definition);
+                        researchEM.removeKey(objectResearched.getDefinition());
                         break;
                     }
                     cleanStackEM_EM(stackEM);
-                    researchEM.remove(stackEM.definition);
+                    researchEM.removeKey(stackEM.getDefinition());
                 }
                 if (eRecipe != null && scannerRecipe != null) {//todo make sure it werks
                     computationRequired = computationRemaining = scannerRecipe.mDuration * 20L;
@@ -409,8 +409,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         computationRemaining = aNBT.getLong("eComputationRemaining");
         computationRequired = aNBT.getLong("eComputationRequired");
         if (aNBT.hasKey("eObject")) {
-            objectResearched = cElementalDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject"));
-            if (objectResearched.definition == nbtE__) {
+            objectResearched = EMDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject"));
+            if (objectResearched.getDefinition() == nbtE__) {
                 objectResearched = null;
             }
         } else {
@@ -423,10 +423,10 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         }
         try {
             if (aNBT.hasKey("eScanObjects")) {
-                objectsScanned = cElementalInstanceStackMap.fromNBT(aNBT.getCompoundTag("eScanObjects"));
+                objectsScanned = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eScanObjects"));
             }
-        } catch (tElementalException e) {
-            objectsScanned = new cElementalInstanceStackMap();
+        } catch (EMException e) {
+            objectsScanned = new EMInstanceStackMap();
         }
     }
 
@@ -445,11 +445,11 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             if (computationRemaining > 0 && objectResearched != null) {
                 eRecipe = null;
                 if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) {
-                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition);
+                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.getDefinition());
                     if (eRecipe != null) {
                         machineType = machine;
                     } else {
-                        eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.definition);
+                        eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.getDefinition());
                         if (eRecipe != null) {
                             machineType = crafter;
                         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index ba6ae223f6..9a6f99bed8 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -10,10 +10,10 @@ import com.github.technus.tectech.mechanics.alignment.IAlignmentLimits;
 import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
 import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
 import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
@@ -109,7 +109,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
     //storage for output EM that will be auto handled in case of failure to finish recipe
     //if you succed to use a recipe - be sure to output EM from outputEM to hatches in the output method
-    protected cElementalInstanceStackMap[] outputEM;
+    protected EMInstanceStackMap[] outputEM;
 
     //are parameters correct - change in check recipe/output/update params etc. (maintenance status boolean)
     protected boolean eParameters = true;
@@ -842,13 +842,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
         int outputLen = aNBT.getInteger("eOutputStackCount");
         if (outputLen > 0) {
-            outputEM = new cElementalInstanceStackMap[outputLen];
+            outputEM = new EMInstanceStackMap[outputLen];
             NBTTagCompound compound = aNBT.getCompoundTag("outputEM");
             for (int i = 0; i < outputEM.length; i++) {
                 if (compound.hasKey(Integer.toString(i))) {
                     try {
-                        outputEM[i] = cElementalInstanceStackMap.fromNBT(compound.getCompoundTag(Integer.toString(i)));
-                    } catch (tElementalException e) {
+                        outputEM[i] = EMInstanceStackMap.fromNBT(compound.getCompoundTag(Integer.toString(i)));
+                    } catch (EMException e) {
                         if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
@@ -966,7 +966,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     private void cleanOrExplode() {
         if (outputEM != null) {
             float mass = 0;
-            for (cElementalInstanceStackMap tree : outputEM) {
+            for (EMInstanceStackMap tree : outputEM) {
                 if (tree != null) {
                     mass += tree.getMass();
                 }
@@ -1155,7 +1155,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                         explodeMultiblock();
                     }
                     if (outputEM != null) {
-                        for (cElementalInstanceStackMap tree : outputEM) {
+                        for (EMInstanceStackMap tree : outputEM) {
                             if (tree != null && tree.hasStacks()) {
                                 explodeMultiblock();
                             }
@@ -1297,26 +1297,26 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             }
             double remaining = voider.overflowMax - voider.getOverflowMatter();
             for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-                for (cElementalInstanceStack instance : in.getContentHandler().valuesToArray()) {
-                    double qty = div(remaining,instance.definition.getMass());
+                for (EMInstanceStack instance : in.getContentHandler().valuesToArray()) {
+                    double qty = div(remaining, instance.getDefinition().getMass());
                     if (qty > 0) {
-                        qty = min(qty, instance.amount);
-                        if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
+                        qty = min(qty, instance.getAmount());
+                        if (voider.addOverflowMatter(instance.getDefinition().getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        in.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        in.getContentHandler().removeAmount(new EMDefinitionStack(instance.getDefinition(), qty));
                     }
                 }
             }
             for (GT_MetaTileEntity_Hatch_OutputElemental out : eOutputHatches) {
-                for (cElementalInstanceStack instance : out.getContentHandler().valuesToArray()) {
-                    double qty = div(remaining,instance.definition.getMass());
+                for (EMInstanceStack instance : out.getContentHandler().valuesToArray()) {
+                    double qty = div(remaining, instance.getDefinition().getMass());
                     if (qty > 0) {
-                        qty = min(qty, instance.amount);
-                        if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
+                        qty = min(qty, instance.getAmount());
+                        if (voider.addOverflowMatter(instance.getDefinition().getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        out.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        out.getContentHandler().removeAmount(new EMDefinitionStack(instance.getDefinition(), qty));
                     }
                 }
             }
@@ -1929,8 +1929,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
     //region convenience copies input and output EM
     //new Method
-    public final cElementalInstanceStackMap getInputsClone_EM() {
-        cElementalInstanceStackMap in = new cElementalInstanceStackMap();
+    public final EMInstanceStackMap getInputsClone_EM() {
+        EMInstanceStackMap in = new EMInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eInputHatches) {
             in.putUnifyAll(hatch.getContentHandler());
         }
@@ -1938,8 +1938,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     }
 
     //new Method
-    public final cElementalInstanceStackMap getOutputsClone_EM() {
-        cElementalInstanceStackMap out = new cElementalInstanceStackMap();
+    public final EMInstanceStackMap getOutputsClone_EM() {
+        EMInstanceStackMap out = new EMInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eOutputHatches) {
             out.putUnifyAll(hatch.getContentHandler());
         }
@@ -1974,7 +1974,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         cleanMassEM_EM(target.getContentHandler().getMass());
     }
 
-    public void cleanStackEM_EM(cElementalInstanceStack target) {
+    public void cleanStackEM_EM(EMInstanceStack target) {
         if (target == null) {
             return;
         }
@@ -2006,7 +2006,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             return;
         }
         float mass = 0;
-        for (cElementalInstanceStackMap map : outputEM) {
+        for (EMInstanceStackMap map : outputEM) {
             if (map != null) {
                 mass += map.getMass();
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
index 093a418056..d1eafa22fc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
@@ -12,7 +12,8 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import java.util.Arrays;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.DoubleCount.*;
@@ -74,7 +75,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         radius = 0.5D - (12D - tier) / 64D;
         maxRCF = Math.pow(Math.E, tier) * 12D;
         maxRPM = Math.sqrt(maxRCF / (0.001118D * radius));
-        double maxSafeMass = dAtomDefinition.getSomethingHeavy().getMass() * (1 << tier);
+        double maxSafeMass = EMAtomDefinition.getSomethingHeavy().getMass() * (1 << tier);
         maxForce = maxSafeMass * maxRCF;// (eV/c^2 * m/s) / g
         maxCapacity = maxSafeMass * AVOGADRO_CONSTANT_144 * radius;// eV/c^2
     }
@@ -83,12 +84,12 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         return RPM * RPM * radius * 0.001118;
     }
 
-    private void addRandomly(cElementalInstanceStack me, cElementalInstanceStackMap[] toThis, int fractionCount) {
-        double amountPerFraction = div(me.amount,fractionCount);
-        cElementalInstanceStack[] stacks = new cElementalInstanceStack[fractionCount];
+    private void addRandomly(EMInstanceStack me, EMInstanceStackMap[] toThis, int fractionCount) {
+        double            amountPerFraction = div(me.getAmount(),fractionCount);
+        EMInstanceStack[] stacks            = new EMInstanceStack[fractionCount];
         for (int i = 0; i < fractionCount; i++) {
             stacks[i] = me.clone();
-            stacks[i].amount = amountPerFraction;
+            stacks[i].setAmount(amountPerFraction);
             toThis[i].putReplace(stacks[i]);
         }
         //int remainingAmount = (int) (me.amount % fractionCount);
@@ -112,23 +113,23 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
-        cElementalInstanceStackMap input = inputs[0];
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+        EMInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.valuesToArray();
+        EMInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
-        for (cElementalInstanceStack stack : stacks) {
+        for (EMInstanceStack stack : stacks) {
             inputMass += Math.abs(stack.getMass());
         }
         double excessMass = 0;
         while (inputMass > maxCapacity) {
-            cElementalInstanceStack randomStack = stacks[TecTech.RANDOM.nextInt(stacks.length)];
-            double amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
-            randomStack.amount= sub(randomStack.amount,amountToRemove);//mutates the parent InstanceStackMap
-            if (randomStack.amount <= 0) {
-                input.remove(randomStack.definition);
+            EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
+            double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
+            randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
+            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+                input.removeKey(randomStack.getDefinition());
                 stacks = input.valuesToArray();
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
@@ -142,10 +143,10 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         if (inputMass * RCF > maxForce) return new MultiblockControl<>(excessMass);//AND THEN IT EXPLODES
 
         // how many output hatches to use
-        int fractionCount = (int) settingFraction.get();
-        cElementalInstanceStackMap[] outputs = new cElementalInstanceStackMap[fractionCount];
+        int                  fractionCount = (int) settingFraction.get();
+        EMInstanceStackMap[] outputs       = new EMInstanceStackMap[fractionCount];
         for (int i = 0; i < fractionCount; i++) {
-            outputs[i] = new cElementalInstanceStackMap();
+            outputs[i] = new EMInstanceStackMap();
         }
 
         //mixing factor...
@@ -165,21 +166,21 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         stacks = input.takeAll().valuesToArray();//cleanup stacks
         if (stacks.length > 1) {
             Arrays.sort(stacks, (o1, o2) -> {
-                double m1 = o1.definition.getMass();
-                double m2 = o2.definition.getMass();
+                double m1 = o1.getDefinition().getMass();
+                double m2 = o2.getDefinition().getMass();
                 if (m1 < m2) return -1;
                 if (m1 > m2) return 1;
                 return o1.compareTo(o2);
             });
 
             double absMassPerOutput = 0;//"volume"
-            for (cElementalInstanceStack stack : stacks) {
+            for (EMInstanceStack stack : stacks) {
                 double tempMass=Math.abs(stack.getMass());
                 if(tempMass!=0) {
-                    double amount = stack.amount;
-                    stack.amount = mul(stack.amount,mixingFactor);
+                    double amount = stack.getAmount();
+                    stack.setAmount(mul(stack.getAmount(),mixingFactor));
                     addRandomly(stack, outputs, fractionCount);
-                    stack.amount = sub(amount,stack.amount);
+                    stack.setAmount(sub(amount, stack.getAmount()));
                     absMassPerOutput += tempMass;
                 }
             }
@@ -197,7 +198,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
                 for (int stackNo = 0; stackNo < stacks.length; stackNo++) {
                     if (stacks[stackNo] != null) {
                         double stackMass = Math.abs(stacks[stackNo].getMass());
-                        double amount = div(remaining,Math.abs(stacks[stackNo].definition.getMass()));
+                        double amount = div(remaining,Math.abs(stacks[stackNo].getDefinition().getMass()));
                         //if(DEBUG_MODE){
                         //    TecTech.LOGGER.info("stackMass "+stackMass);
                         //    TecTech.LOGGER.info("defMass "+stacks[stackNo].definition.getMass());
@@ -207,16 +208,16 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
                         if (stackMass == 0) {
                             addRandomly(stacks[stackNo], outputs, fractionCount);
                             stacks[stackNo] = null;
-                        } else if (amount >= stacks[stackNo].amount) {
+                        } else if (amount >= stacks[stackNo].getAmount()) {
                             remaining= sub(remaining,stackMass);
                             outputs[fraction].putUnify(stacks[stackNo]);
                             stacks[stackNo] = null;
                         } else if (amount > 0) {
-                            remaining= sub(remaining, mul(amount,stacks[stackNo].definition.getMass()));
-                            cElementalInstanceStack clone = stacks[stackNo].clone();
-                            clone.amount = amount;
+                            remaining= sub(remaining, mul(amount, stacks[stackNo].getDefinition().getMass()));
+                            EMInstanceStack clone = stacks[stackNo].clone();
+                            clone.setAmount(amount);
                             outputs[fraction].putUnify(clone);
-                            stacks[stackNo].amount= sub(stacks[stackNo].amount,amount);
+                            stacks[stackNo].setAmount(sub(stacks[stackNo].getAmount(),amount));
                             //if(DEBUG_MODE){
                             //    TecTech.LOGGER.info("remainingAfter "+remaining);
                             //    TecTech.LOGGER.info("amountCloneAfter "+clone.amount+"/"+stacks[stackNo].amount);
@@ -228,7 +229,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
                 }
             }
             //add remaining
-            for (cElementalInstanceStack stack : stacks) {
+            for (EMInstanceStack stack : stacks) {
                 if (stack != null) {
                     outputs[fractionCount - 1].putUnify(stack);
                 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
index d335bac7ab..4c95c2acd7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -24,7 +24,7 @@ public class Behaviour_Electrolyzer implements GT_MetaTileEntity_EM_machine.IBeh
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
index 6ac6ac74c4..70d93b36ed 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
@@ -1,15 +1,16 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.DoubleCount.mul;
@@ -88,7 +89,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
     public Behaviour_ElectromagneticSeparator(int desiredTier){
         tier=(byte) desiredTier;
         ticks =Math.max(20,(1<<(12-desiredTier))*20);
-        maxCapacity= dAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* AVOGADRO_CONSTANT_144;
+        maxCapacity= EMAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* AVOGADRO_CONSTANT_144;
         maxCharge=144D*(1<<(tier-5));
         switch (tier){
             case 12:
@@ -143,23 +144,23 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
-        cElementalInstanceStackMap input = inputs[0];
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+        EMInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.valuesToArray();
+        EMInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
-        for (cElementalInstanceStack stack : stacks) {
+        for (EMInstanceStack stack : stacks) {
             inputMass += Math.abs(stack.getMass());
         }
         float excessMass = 0;
         while (inputMass > maxCapacity) {
-            cElementalInstanceStack randomStack = stacks[TecTech.RANDOM.nextInt(stacks.length)];
-            double amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
-            randomStack.amount= sub(randomStack.amount,amountToRemove);//mutates the parent InstanceStackMap
-            if (randomStack.amount <= 0) {
-                input.remove(randomStack.definition);
+            EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
+            double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
+            randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
+            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+                input.removeKey(randomStack.getDefinition());
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
             excessMass += mass;
@@ -174,9 +175,9 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
         int mTicks=(int)(ticks*(inputMass/maxCapacity));
         mTicks=Math.max(mTicks,20);
 
-        cElementalInstanceStackMap[] outputs = new cElementalInstanceStackMap[3];
+        EMInstanceStackMap[] outputs = new EMInstanceStackMap[3];
         for (int i = 0; i < 3; i++) {
-            outputs[i] = new cElementalInstanceStackMap();
+            outputs[i] = new EMInstanceStackMap();
         }
 
         double offsetIn=offsetSetting.get();
@@ -186,8 +187,8 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
 
         //take all from hatch handler and put into new map - this takes from hatch to inner data storage
         stacks = input.takeAll().valuesToArray();//cleanup stacks
-        for(cElementalInstanceStack stack:stacks){
-            double charge=stack.definition.getCharge()-offsetIn;
+        for(EMInstanceStack stack:stacks){
+            double charge= stack.getDefinition().getCharge()-offsetIn;
             if(charge<precisionMinimalIn && charge>-precisionMinimalIn){
                 outputs[1].putReplace(stack);
             }else if(charge>=precisionFullIn){
@@ -195,13 +196,13 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
             }else if(charge<=-precisionFullIn){
                 outputs[0].putReplace(stack);
             }else{
-                double amount=mul(stack.amount,(Math.abs(charge)-precisionMinimalIn+1D)/levelsCountPlus1);//todo check
-                if (amount < stack.amount) {
-                    cElementalInstanceStack clone = stack.clone();
-                    clone.amount = sub(clone.amount, amount);
+                double amount=mul(stack.getAmount(),(Math.abs(charge)-precisionMinimalIn+1D)/levelsCountPlus1);//todo check
+                if (amount < stack.getAmount()) {
+                    EMInstanceStack clone = stack.clone();
+                    clone.setAmount(sub(clone.getAmount(), amount));
                     outputs[1].putReplace(clone);
 
-                    stack.amount = amount;
+                    stack.setAmount(amount);
                 }
                 if(charge>0){
                     outputs[2].putReplace(stack);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
index 97ece16fb1..7d472de847 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -24,7 +24,7 @@ public class Behaviour_PrecisionLaser implements GT_MetaTileEntity_EM_machine.IB
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
index f7aa945d69..05050a3c66 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -26,9 +26,9 @@ public class Behaviour_Recycler implements GT_MetaTileEntity_EM_machine.IBehavio
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         double mass=0;
-        for (cElementalInstanceStackMap input : inputs) {
+        for (EMInstanceStackMap input : inputs) {
             if (input != null) {
                 mass += input.getMass();
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
index 2dc9067e22..fa517c73d4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -24,7 +24,7 @@ public class Behaviour_Scanner implements GT_MetaTileEntity_EM_machine.IBehaviou
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index d9217171d3..e653c1a357 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -161,7 +161,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
          * @param parameters array passed from previous method!
          * @return null if recipe should not start, control object to set machine state and start recipe
          */
-        MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters);
+        MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters);
     }
 
     private void quantumStuff(boolean shouldIExist) {
@@ -254,7 +254,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             return false;
         }
 
-        cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6];
+        EMInstanceStackMap[] handles = new EMInstanceStackMap[6];
         for (int i = 0; i < 6; i++) {
             int pointer = (int) inputMux[i].get();
             if (pointer >= 0 && pointer < eInputHatches.size()) {
@@ -272,7 +272,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             }
         }
 
-        MultiblockControl<cElementalInstanceStackMap[]> control = currentBehaviour.process(handles, this, parametrization);
+        MultiblockControl<EMInstanceStackMap[]> control = currentBehaviour.process(handles, this, parametrization);
         if (control == null) {
             return false;
         }
@@ -311,7 +311,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             return;
         }
 
-        cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6];
+        EMInstanceStackMap[] handles = new EMInstanceStackMap[6];
         for (int i = 0; i < 6; i++) {
             int pointer = (int) outputMux[i].get();
             if (pointer >= 0 && pointer < eOutputHatches.size()) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo
index 7059fdf6fd..a195157a17 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo	
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo	
@@ -23,16 +23,16 @@ BlockFakeLight.java
 for turrets:
 floodlightb
 
+mega - projects
+
 
 
 fix eu/t checks if needs maintenance!!!
 
 make microwave grinder cap autosmelting based on power
 
-
 iterative halflife formula:
 
 =prev qty* 2^(-t diff / t half)
 
-
 actual ion cannons
diff --git a/src/main/java/com/github/technus/tectech/util/DoubleCount.java b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
index b37c0987ae..576123079c 100644
--- a/src/main/java/com/github/technus/tectech/util/DoubleCount.java
+++ b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
@@ -3,26 +3,40 @@ package com.github.technus.tectech.util;
 import java.util.Arrays;
 
 import static java.lang.Math.*;
-import static java.lang.Math.max;
-import static java.lang.Math.ulp;
 
 public class DoubleCount {
-    public static double[] distribute(double count,double... probabilities) throws ArithmeticException {
-        if (probabilities == null) {
+    /**
+     * Distributes count across probabilities
+     *
+     * @param count         the count to divide
+     * @param probabilities probability ratios to divide by, descending
+     * @return divided count
+     * @throws ArithmeticException
+     */
+    public static double[] distribute(double count, double... probabilities) throws ArithmeticException {
+        if (probabilities == null || Double.isNaN(count)) {
             return null;
         } else if (count == 0) {
             return new double[probabilities.length];
+        } else if (Double.isInfinite(count)) {
+            double[] doubles = new double[probabilities.length];
+            Arrays.fill(doubles, count);
+            return doubles;
         } else {
             switch (probabilities.length) {
                 default: {
-                    int size = probabilities.length;
+                    int      size   = probabilities.length;
                     double[] output = new double[size];
                     size--;
-                    double remaining = count, previous = probabilities[size], probability, out, sum = 0;
+                    double remaining = count, previous = probabilities[size], probability, out;
                     for (int i = size - 1; i >= 0; i--) {
                         probability = probabilities[i];
-                        remaining -= out = count * probability - ulp(probability);
-                        sum += output[i] = out;
+                        out = count * probability;
+                        out -= ulpSigned(out);
+
+                        remaining -= out;
+                        output[i] = out;
+
                         if (previous < probability) {
                             throw new ArithmeticException("Malformed probability order: " + Arrays.toString(probabilities));
                         }
@@ -31,14 +45,10 @@ public class DoubleCount {
                             break;
                         }
                     }
-                    if (remaining * count < 0) {
+                    if (remaining * count < 0) {//overshoot
                         finishIt(size, output, remaining);
                     } else {
-                        sum += output[size] = remaining - ulp(remaining) * size;
-                        if (sum > count) {
-                            remaining = sum - count;
-                            finishIt(size, output, remaining);
-                        }
+                        output[size] = remaining;
                     }
                     return output;
                 }
@@ -50,84 +60,58 @@ public class DoubleCount {
         }
     }
 
+    public static double ulpSigned(double number) {
+        if (number == 0) {
+            return 0;
+        }
+        return number > 0 ? ulp(number) : -ulp(number);
+    }
+
     private static void finishIt(int size, double[] output, double remaining) {
         for (int i = size - 1; i >= 0; i--) {
             if (abs(output[i]) >= abs(remaining)) {
                 output[i] -= remaining;
                 break;
             } else {
-                remaining+=output[i];
-                output[i]=0;
+                remaining += output[i];
+                output[i] = 0;
             }
         }
     }
 
-    public static double div(double count,double divisor){
-        if (divisor == 0) {
-            throw new ArithmeticException("Divide by 0");
-        }else if(count==0 || divisor==1){
-            return count;
-        }else if(divisor==-1){
-            return -count;
+    public static double div(double count, double divisor) {
+        if (count == 0 || abs(divisor) == 1 || abs(count)==abs(divisor)) {
+            return count/divisor;
         } else {
             double result = count / divisor;
-            if(result*count<0){
-                return 0;
-            }
-            return result-ulp(result);
+            return result - ulpSigned(result);
         }
     }
 
-    public static double mul(double count,double multiplier){
-        if(count==0 || multiplier==1){
-            return count;
-        }else if(multiplier==-1){
-            return -count;
+    public static double mul(double count, double multiplier) {
+        if (count == 0 || multiplier == 0 || abs(multiplier)==1 || abs(count)==1) {
+            return count*multiplier;
         } else {
             double result = count * multiplier;
-            if(result*count<0){
-                return 0;
-            }
-            return result-ulp(result);
+            return result - ulpSigned(result);
         }
     }
 
-    public static double sub(double count,double value){
-        if(value==0){
-            return count;
-        }
-        if(count==0){
-            return -value;
-        }
-        if(value==count){
-            return 0;
-        }
-        return value < 0 ? addInternal(count, -value) : subInternal(count, value);
-    }
-
-    public static double add(double count,double value){
-        if(value==0){
-            return count;
-        }
-        if(count==0){
-            return value;
-        }
-        return value < 0 ? subInternal(count, -value) : addInternal(count, value);
-    }
-
-    private static double subInternal(double count,double value){
-        double result = count - max(value,ulp(count));
-        if (result+value>count || value>count-result){
-            result-=ulp(result);
+    public static double sub(double count, double value) {
+        if (count == 0 || value == 0 || count == value) {
+            return count - value;
+        } else {
+            double result = count - value;
+            return result - ulpSigned(result);
         }
-        return result;
     }
 
-    private static double addInternal(double count,double value){
-        double result = count + value;
-        if (result-value>count || result-count>value){
-            result-=ulp(result);
+    public static double add(double count, double value) {
+        if (count == 0 || value == 0 || count == -value) {
+            return count + value;
+        } else {
+            double result = count + value;
+            return result - ulpSigned(result);
         }
-        return result;
     }
 }
-- 
cgit 


From 44c86af58ecb24de8ba66fa6cf8fa81324a32a28 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 18 Jan 2022 21:57:53 +0100
Subject: Cleanup serialization of EM

---
 .../entity/projectiles/projectileEM.java           |   4 +-
 .../definitions/EMComplexAspectDefinition.java     |  30 +--
 .../definitions/EMPrimalAspectDefinition.java      |   4 +-
 .../transformations/AspectDefinitionCompat.java    |   2 +-
 .../AspectDefinitionCompatEnabled.java             |   4 +-
 .../thing/metaTileEntity/multi/EssentiaCompat.java |   2 +-
 .../multi/EssentiaCompatEnabled.java               |   2 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |   2 +-
 .../technus/tectech/loader/ElementalLoader.java    |   3 -
 .../elementalMatter/core/EMException.java          |  17 +-
 .../elementalMatter/core/commands/EMGive.java      |  15 +-
 .../elementalMatter/core/commands/EMList.java      |  14 +-
 .../elementalMatter/core/decay/EMDecay.java        |   2 +-
 .../core/definitions/EMComplexTemplate.java        |  73 ++++++
 .../core/definitions/EMDefinitionsRegistry.java    | 110 ++++++++
 .../core/definitions/EMPrimitiveTemplate.java      | 243 ++++++++++++++++++
 .../core/definitions/IEMDefinition.java            |  85 +++++++
 .../core/maps/EMConstantStackMap.java              |   2 +-
 .../core/maps/EMDefinitionStackMap.java            |   2 +-
 .../core/maps/EMInstanceStackMap.java              |   2 +-
 .../elementalMatter/core/maps/EMStackMap.java      |   2 +-
 .../elementalMatter/core/maps/IEMMapRead.java      |  39 ++-
 .../elementalMatter/core/maps/IEMMapWrite.java     |   2 +-
 .../core/maps/IEMMapWriteExact.java                |   2 +-
 .../core/stacks/EMDefinitionStack.java             |   6 +-
 .../core/stacks/EMInstanceStack.java               |   7 +-
 .../elementalMatter/core/stacks/IEMStack.java      |   2 +-
 .../elementalMatter/core/templates/EMComplex.java  | 135 ----------
 .../core/templates/EMPrimitive.java                | 283 ---------------------
 .../core/templates/IEMDefinition.java              |  84 ------
 .../core/transformations/EMTransformationInfo.java |  25 +-
 .../definitions/complex/EMAtomDefinition.java      |  34 +--
 .../definitions/complex/EMHadronDefinition.java    |  50 ++--
 .../definitions/complex/EMNuclideIAEA.java         |   2 +-
 .../definitions/primitive/EMBosonDefinition.java   |   4 +-
 .../definitions/primitive/EMLeptonDefinition.java  |   4 +-
 .../primitive/EMNeutrinoDefinition.java            |   4 +-
 .../primitive/EMPrimitiveDefinition.java           |  10 +-
 .../definitions/primitive/EMQuarkDefinition.java   |   4 +-
 .../github/technus/tectech/recipe/TT_recipe.java   |   6 +-
 .../technus/tectech/recipe/TT_recipeAdder.java     |   2 +-
 .../item/DebugElementalInstanceContainer_EM.java   |   7 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       |  10 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |   2 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   4 +-
 45 files changed, 692 insertions(+), 656 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java

diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index d594a826bc..785b59f093 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -52,10 +52,10 @@ public class projectileEM extends LaserProjectile {
             charge=projectileContent.getCharge();
             massFactor =(float) (projectileContent.getDefinition().getMass()/ EMHadronDefinition.hadron_n_.getMass());
 
-            if(projectileContent.getDefinition().getType()>1 || projectileContent.getDefinition().getType()<-1) {
+            if(projectileContent.getDefinition().getMatterType()>1 || projectileContent.getDefinition().getMatterType()<-1) {
                 strange = true;
             }
-            if(projectileContent.getDefinition().getType()<0) {
+            if(projectileContent.getDefinition().getMatterType()<0) {
                 antiMatter = true;
             }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index 432d151b80..e56e31f166 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -2,13 +2,14 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
@@ -25,7 +26,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class EMComplexAspectDefinition extends EMComplex {
+public final class EMComplexAspectDefinition extends EMComplexTemplate {
     private final int    hash;
     private final double mass;
 
@@ -123,19 +124,8 @@ public final class EMComplexAspectDefinition extends EMComplex {
     }
 
     @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, aspectStacks);
-    }
-
-    public static NBTTagCompound getNbtTagCompound(byte nbtType, EMConstantStackMap aspectStacks) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        EMDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
-        nbt.setInteger("i", quarkStacksValues.length);
-        for (int i = 0; i < quarkStacksValues.length; i++) {
-            nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
-        }
-        return nbt;
+    protected int getIndirectTagValue() {
+        return nbtType;
     }
 
     public static EMComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
@@ -169,7 +159,7 @@ public final class EMComplexAspectDefinition extends EMComplex {
     }
 
     @Override
-    public byte getType() {
+    public byte getMatterType() {
         return 0;
     }
 
@@ -250,20 +240,20 @@ public final class EMComplexAspectDefinition extends EMComplex {
 
     public static void run() {
         try {
-            EMComplex.addCreatorFromNBT(nbtType, EMComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96);
+            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMComplexAspectDefinition::fromNBT,EMComplexAspectDefinition.class, getClassTypeStatic());
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
         if (DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96);
+            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
     @Override
     public byte getClassType() {
-        return -96;
+        return getClassTypeStatic();
     }
 
     public static byte getClassTypeStatic() {
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
index bf9703d6d7..e62c2e5278 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -8,7 +8,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class EMPrimalAspectDefinition extends EMPrimitive {
+public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     public static final EMPrimalAspectDefinition
             magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
             magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
index c7f38eb21d..a4328d2e03 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
 
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
index c9ca5d7b9f..ead8a5fdef 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -2,13 +2,13 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.tran
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import thaumcraft.api.aspects.Aspect;
 
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry.STACKS_REGISTERED;
 
 /**
  * Created by Tec on 21.05.2017.
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
index d51bc8dc2d..35d3a1b91f 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
index ab682ba1a5..37df2c48cc 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 5606442c37..5fe8c973fe 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defin
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index 7ce371e57e..61989e7b13 100644
--- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMNuclideIAEA;
@@ -18,8 +17,6 @@ public class ElementalLoader implements Runnable {
         // Definition init
         // ===================================================================================================
 
-        EMPrimitive.run();
-
         EMPrimitiveDefinition.run();
 
         EMQuarkDefinition.run();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
index 23ca5d77d9..e00e72446d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
@@ -3,8 +3,23 @@ package com.github.technus.tectech.mechanics.elementalMatter.core;
 /**
  * Created by danie_000 on 19.11.2016.
  */
-public final class EMException extends Exception {
+public final class EMException extends RuntimeException {
     public EMException(String message) {
         super(message);
     }
+
+    public EMException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public EMException(Throwable cause) {
+        super(cause);
+    }
+
+    public EMException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public EMException() {
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
index 64e9bcea1e..af4caf854b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -5,9 +5,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
@@ -77,11 +76,11 @@ public class EMGive implements ICommand {
         try{
             int id=Integer.parseInt(args.get(0));
             args.remove(0);
-            IEMDefinition primitive = EMPrimitive.getBindsPrimitive().get(id);
+            IEMDefinition primitive = IEMDefinition.getBindsPrimitive().get(id);
             return new EMDefinitionStack(primitive,amount);
         }catch (NumberFormatException e){
             byte clazz = (byte) args.remove(0).charAt(0);
-            Method constructor = EMComplex.getBindsComplex().get(clazz);
+            Method constructor = IEMDefinition.getBindsComplex().get(clazz);
 
             EMDefinitionStackMap stacks =new EMDefinitionStackMap();
             while(args.size()>0){
@@ -129,12 +128,12 @@ public class EMGive implements ICommand {
 
     private List<String> completionsForClassOrID(){
         ArrayList<String> strings=new ArrayList<>(8);
-        Map<Byte,Method> binds= EMComplex.getBindsComplex();
+        Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
         for (Map.Entry<Byte,Method> e:binds.entrySet()) {
             strings.add(String.valueOf((char)e.getKey().byteValue()));
         }
-        Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
-        for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+        Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
+        for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
             strings.add(String.valueOf(e.getKey().byteValue()));
         }
         return strings;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
index 395592036f..13531dbf85 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
@@ -27,15 +27,15 @@ public class EMList implements ICommand {
         if (!sender.getEntityWorld().isRemote) {
             if(args.length == 0) {
                 sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
-                Map<Byte,Method> binds= EMComplex.getBindsComplex();
+                Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
                 for (Map.Entry<Byte,Method> e:binds.entrySet()) {
                     sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
                 }
             }else if(args.length==1){
                 sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
-                if(args[0].equals(String.valueOf((char) EMPrimitive.nbtType))){
-                    Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
-                    for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+                if(args[0].equals(String.valueOf((char) EMPrimitiveTemplate.nbtType))){
+                    Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
+                    for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
                         sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getLocalizedName()));
                     }
                 }else{
@@ -65,7 +65,7 @@ public class EMList implements ICommand {
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
         if(args.length==0){
-            Map<Byte,Method> binds= EMComplex.getBindsComplex();
+            Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
             ArrayList<String> strings=new ArrayList<>(binds.size());
             for (Map.Entry<Byte,Method> e:binds.entrySet()) {
                 strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
index bed49a5040..a6bd623414 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
@@ -4,7 +4,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstant
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import static com.github.technus.tectech.util.DoubleCount.mul;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
new file mode 100644
index 0000000000..94a50ce322
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
@@ -0,0 +1,73 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Created by danie_000 on 23.01.2017.
+ */
+public abstract class EMComplexTemplate implements IEMDefinition {
+    /**
+     * Just empty array?
+     */
+    public static final IEMDefinition[] nothing = new EMPrimitiveTemplate[0];
+
+    @Override
+    public final EMComplexTemplate clone() {
+        return this;//IMMUTABLE
+    }
+
+    @Override
+    public int compareTo(IEMDefinition o) {
+        int classCompare = compareClassID(o);
+        if (classCompare != 0) {
+            return classCompare;
+        }
+        //that allows neat check if the same thing and
+        //top hierarchy amount can be used to store amount info
+        return getSubParticles().compareWithAmountsInternal(o.getSubParticles());
+    }
+
+    @Override
+    public final EMDefinitionStack getStackForm(double amount) {
+        return new EMDefinitionStack(this, amount);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        if(this==obj) {
+            return true;
+        }
+        if (obj instanceof IEMDefinition) {
+            return compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Internal amounts should be also hashed
+        int hash = -(getSubParticles().size() << 4);
+        for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
+            int amount=(int) stack.getAmount();
+            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return getLocalizedName()+ '\n' + getSymbol();
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbtTagCompound = getSubParticles().toNBT();
+        nbtTagCompound.setInteger(EMDefinitionsRegistry.getIndirectTagName(), getIndirectTagValue());
+        return nbtTagCompound;
+    }
+
+    protected abstract int getIndirectTagValue();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
new file mode 100644
index 0000000000..c0f9df32f2
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
@@ -0,0 +1,110 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+import java.util.function.Function;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+
+public class EMDefinitionsRegistry {
+    private static final NavigableSet<IEMDefinition>                                     STACKS_REGISTERED = new TreeSet<>();
+    private static final Map<Integer, IEMDefinition>                                     DIRECT_BINDS      = new HashMap<>();
+    private static final Map<Integer, Function<NBTTagCompound, ? extends IEMDefinition>> CLASS_BINDS       = new HashMap<>();//creator methods in subclasses
+    private static final Map<Integer, Class<? extends IEMDefinition>>                    CLASSES           = new HashMap<>();
+    private static final Map<Class<? extends IEMDefinition>, Integer>                    CLASS_TYPES       = new HashMap<>();
+    private static final String                                                          INDIRECT_TAG      = "t";
+    private static final String                                                          DIRECT_TAG        = "c";
+
+    private EMDefinitionsRegistry() {
+    }
+
+    static {
+        CLASS_BINDS.put(0, EMDefinitionsRegistry::getDefinitionDirect);
+        CLASS_BINDS.put((int) 'p', EMDefinitionsRegistry::getDefinitionDirect);
+    }
+
+    private static IEMDefinition getDefinitionDirect(NBTTagCompound nbt) {
+        return DIRECT_BINDS.get(nbt.getInteger(getDirectTagName()));
+    }
+
+    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
+        IEMDefinition apply;
+        try {
+            apply = CLASS_BINDS.get(nbt.getInteger(getIndirectTagName())).apply(nbt);
+        } catch (Exception e) {
+            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
+            if (DEBUG_MODE) {
+                emException.printStackTrace();
+                return nbtE__;
+            } else {
+                throw emException;
+            }
+        }
+        if (!DEBUG_MODE) {
+            if (apply == nbtE__) {
+                throw new EMException("Deserialized to NBT ERROR!");
+            } else if (apply == null__ || apply == null) {
+                throw new EMException("Deserialized to NULL POINTER!");
+            }
+        }
+        if (apply == null) {
+            return null__;
+        }
+        return apply;
+    }
+
+    public static <T extends IEMDefinition> void registerDefinitionClass(int shortcutNBT, Function<NBTTagCompound, T> creator, Class<T> clazz, int classID) {
+        if (CLASS_BINDS.put(shortcutNBT, creator) != null) {
+            EMException e = new EMException("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+        if (CLASSES.put(classID, clazz) != null) {
+            EMException e = new EMException("Duplicate Class ID! " + classID + " used for class comparison");
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+        CLASS_TYPES.put(clazz, classID);
+    }
+
+    public static void registerDirectDefinition(IEMDefinition definition, int id) {
+        IEMDefinition old = DIRECT_BINDS.put(id, definition);
+        if (old != null) {
+            EMException e = new EMException("Duplicate primitive EM ID: " + id +
+                    " for " + definition.getLocalizedName() +
+                    " and " + old.getLocalizedName());
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    public static NavigableSet<IEMDefinition> getStacksRegisteredForDisplay() {
+        return STACKS_REGISTERED;
+    }
+
+    public static void registerForDisplay(IEMDefinition definition){
+        STACKS_REGISTERED.add(definition);
+        STACKS_REGISTERED.add(definition.getAnti());
+    }
+
+    public static String getIndirectTagName() {
+        return INDIRECT_TAG;
+    }
+
+    public static String getDirectTagName() {
+        return DIRECT_TAG;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
new file mode 100644
index 0000000000..f3ce34dd1d
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -0,0 +1,243 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static com.github.technus.tectech.util.Util.areBitsSet;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!
+ */
+public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
+    private final String name;
+    private final String symbol;
+    //float-mass in eV/c^2
+    private final double mass;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    charge;
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
+    private final byte   color;
+    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
+    private final byte type;
+
+    private EMPrimitiveTemplate anti;//IMMUTABLE
+    private EMDecay[]           elementalDecays;
+    private byte                naturalDecayInstant;
+    private byte energeticDecayInstant;
+    private double rawLifeTime;
+
+    private final int ID;
+
+    //no _ at end - normal particle
+    //   _ at end - anti particle
+    //  __ at end - self is antiparticle
+
+    protected EMPrimitiveTemplate(String name, String symbol, int type, double mass, int charge, int color, int ID) {
+        this.name = name;
+        this.symbol = symbol;
+        this.type = (byte) type;
+        this.mass = mass;
+        this.charge = charge;
+        this.color = (byte) color;
+        this.ID = ID;
+        EMDefinitionsRegistry.registerDirectDefinition(this,ID);
+    }
+
+    //
+    protected void init(EMPrimitiveTemplate antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
+        anti = antiParticle;
+        this.rawLifeTime = rawLifeTime;
+        naturalDecayInstant = (byte) naturalInstant;
+        energeticDecayInstant = (byte) energeticInstant;
+        elementalDecays =elementalDecaysArray;
+        EMDefinitionsRegistry.registerForDisplay(this);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Undefined: " + getName();
+    }
+
+    @Override
+    public String getSymbol() {
+        return symbol;
+    }
+
+    @Override
+    public String getShortSymbol() {
+        return getSymbol();
+    }
+
+    @Override
+    public IEMDefinition getAnti() {
+        return anti;//no need for copy
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    @Override
+    public byte getColor() {
+        return color;
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        if (naturalDecayInstant < 0) {
+            return elementalDecays;
+        }else if (naturalDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[naturalDecayInstant]};
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        if (energeticDecayInstant < 0) {
+            return elementalDecays;
+        }else if (energeticDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[energeticDecayInstant]};
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        return elementalDecays;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return rawLifeTime;
+    }
+
+    @Override
+    public final EMConstantStackMap getSubParticles() {
+        return null;
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public byte getMatterType() {
+        return type;
+    }
+
+    @Override
+    public final NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setInteger(EMDefinitionsRegistry.getDirectTagName(), ID);
+        return nbt;
+    }
+
+    @Override
+    public final byte getClassType() {
+        return getClassTypeStatic();
+    }
+
+    public static byte getClassTypeStatic(){
+        return -128;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + EMDefinitionsRegistry.getDirectTagName() + ' ' + getClassType());
+        }
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+ getLocalizedName());
+            lines.add("SYMBOL = "+getSymbol());
+        }
+        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    "+"At current energy level");
+        }
+    }
+
+    @Override
+    public final int compareTo(IEMDefinition o) {
+        if (getClassType() == o.getClassType()) {
+            int oID = ((EMPrimitiveTemplate) o).ID;
+            return Integer.compare(ID, oID);
+        }
+        return compareClassID(o);
+    }
+
+    @Override
+    public final int hashCode() {
+        return ID;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
new file mode 100644
index 0000000000..06bfc61737
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
@@ -0,0 +1,85 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+/**
+ * Created by danie_000 on 11.11.2016.
+ */
+public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IMMUTABLE
+    double            STABLE_RAW_LIFE_TIME       =1.5e36D;
+    double            NO_DECAY_RAW_LIFE_TIME     =-1D;
+    long              DEFAULT_ENERGY_LEVEL       =0;
+    double            DEFAULT_ENERGY_REQUIREMENT =25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
+    //add text based creators for recipe formula input?
+
+    //Nomenclature
+    String getLocalizedName();
+
+    String getSymbol();
+
+    String getShortSymbol();
+
+    void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    byte getMatterType();
+
+    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
+
+    //Not dynamically changing stuff
+    IEMDefinition getAnti();//gives new anti particle def
+
+    EMDecay[] getDecayArray();//possible decays
+
+    EMDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
+
+    EMDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
+
+    boolean usesSpecialEnergeticDecayHandling();
+
+    boolean usesMultipleDecayCalls(long energyLevel);
+
+    boolean decayMakesEnergy(long energyLevel);
+
+    boolean fusionMakesEnergy(long energyLevel);
+
+    double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
+
+    double getMass();//mass... MeV/c^2
+
+    int getCharge();//charge 1/3 electron charge
+
+    //dynamically changing stuff
+    byte getColor();//-1 nope cannot 0 it can but undefined
+
+    double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
+
+    boolean isTimeSpanHalfLife();
+
+    EMConstantStackMap getSubParticles();//contents... null if none
+
+    EMFluidDequantizationInfo someAmountIntoFluidStack();
+
+    EMItemDequantizationInfo someAmountIntoItemsStack();
+
+    EMOredictDequantizationInfo someAmountIntoOredictStack();
+
+    NBTTagCompound toNBT();
+
+    EMDefinitionStack getStackForm(double amount);
+
+    IEMDefinition clone();
+
+    default int compareClassID(IEMDefinition obj) {
+        return (int) getClassType() - obj.getClassType();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
index d9297436a0..e6cfa7d03e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.Collections;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
index 45ce50d5c7..78bb8d740a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.NavigableMap;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
index c15142787f..69dc53f83d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -4,7 +4,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayRe
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
index 4c798499b5..795ac3d3bf 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import java.util.NavigableMap;
 import java.util.TreeMap;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
index 392d06f5cf..1322566914 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
@@ -136,8 +136,8 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setInteger("i", size());
         int i = 0;
-        for (T stack : values()) {
-            nbt.setTag(Integer.toString(i++), stack.toNBT());
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            nbt.setTag(Integer.toString(i++), entry.getValue().toNBT());
         }
         return nbt;
     }
@@ -161,6 +161,39 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         return 0;
     }
 
+    /**
+     * use only for nested operations!
+     * @param o
+     * @return
+     */
+    default int compareWithAmountsInternal(IEMMapRead<? extends IEMStack> o) {
+        if (o == null) {
+            return 1;
+        }
+
+        int lenDiff = size() - o.size();
+        if (lenDiff != 0) {
+            return lenDiff;
+        }
+
+        Iterator<Map.Entry<IEMDefinition, T>>                            iterator  = entrySet().iterator();
+        Iterator<? extends Map.Entry<IEMDefinition, ? extends IEMStack>> iteratorO = o.entrySet().iterator();
+
+        while (iterator.hasNext()) {
+            T        first  = iterator.next().getValue();
+            IEMStack second = iteratorO.next().getValue();
+            int      result = first.compareTo(second);
+            if (result != 0) {
+                return result;
+            }
+            result=Double.compare(first.getAmount(),second.getAmount());
+            if (result != 0) {
+                return result;
+            }
+        }
+        return 0;
+    }
+
     default double getMass(){
         double mass=0;
         for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
index cc22267474..f13e82fb26 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
 
 import java.util.Map;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
index 7b8853a2f4..167ec8451d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
index fe0c73e795..f868dbe0ad 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
@@ -50,7 +50,7 @@ public final class EMDefinitionStack implements IEMStack {
 
     public static EMDefinitionStack fromNBT(NBTTagCompound nbt) {
         return new EMDefinitionStack(
-                EMComplex.fromNBT(nbt.getCompoundTag("d")),
+                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
                 nbt.getLong("q")+nbt.getDouble("Q"));
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
index b73bd21f02..6347cd2144 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.util.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
@@ -558,9 +558,8 @@ public final class EMInstanceStack implements IEMStack {
     }
 
     public static EMInstanceStack fromNBT(NBTTagCompound nbt) {
-        NBTTagCompound definition = nbt.getCompoundTag("d");
         EMInstanceStack instance = new EMInstanceStack(
-                EMComplex.fromNBT(definition),
+                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
                 nbt.getLong("q") + nbt.getDouble("Q"),
                 nbt.getFloat("m") + nbt.getDouble("M"),
                 nbt.getLong("a") + nbt.getDouble("A"),
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
index 94c76634d9..5672b31c04 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
deleted file mode 100644
index 7fc074bded..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 23.01.2017.
- */
-public abstract class EMComplex implements IEMDefinition {
-    //Nothing array
-    public static final IEMDefinition[] nothing = new EMPrimitive[0];
-
-    //add text based creators for recipe formula input?
-    private static final Map<Byte, Method> nbtCreationBind = new HashMap<>();//creator methods in subclasses
-    private static final HashSet<Byte> classSet = new HashSet<>();
-
-    protected static void addCreatorFromNBT(byte shortcutNBT, Method constructorFromNBT,byte classID) {
-        if(nbtCreationBind.put(shortcutNBT, constructorFromNBT)!=null) {
-            throw new Error("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
-        }
-        if(!classSet.add(classID)) {
-            throw new Error("Duplicate Class ID! " + classID + " used for class comparison");
-        }
-    }
-
-    public static Map<Byte, Method> getBindsComplex(){
-        return nbtCreationBind;
-    }
-
-    @Override
-    public final EMComplex clone() {
-        return this;//IMMUTABLE
-    }
-
-    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
-        try {
-            return (IEMDefinition) nbtCreationBind.get(nbt.getByte("t")).invoke(null, nbt);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return nbtE__;
-        }
-    }
-
-    @Override
-    public int compareTo(IEMDefinition o) {
-        int classCompare = compareClassID(o);
-        if (classCompare != 0) {
-            return classCompare;
-        }
-
-        //only of the internal def stacks!!!
-        //that allows neat check if the same thing and
-        //top hierarchy amount can be used to store amount info
-        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
-    }
-
-    //use only for nested operations!
-    private static int compareInnerContentsWithAmounts(EMDefinitionStack[] tc, EMDefinitionStack[] sc) {
-        if (tc == null) {
-            if (sc == null) {
-                return 0;
-            } else {
-                return -1;
-            }
-        }
-        if (sc == null) {
-            return 1;
-        }
-
-        int lenDiff = tc.length - sc.length;
-        if (lenDiff != 0) {
-            return lenDiff;
-        }
-
-        for (int i = 0; i < tc.length; i++) {
-            int cn = tc[i].getDefinition().compareTo(sc[i].getDefinition());
-            if (cn != 0) {
-                return cn;
-            }
-
-            if (tc[i].getAmount() > sc[i].getAmount()) {
-                return 1;
-            }
-            if (tc[i].getAmount() < sc[i].getAmount()) {
-                return -1;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public final EMDefinitionStack getStackForm(double amount) {
-        return new EMDefinitionStack(this, amount);
-    }
-
-    @Override
-    public final boolean equals(Object obj) {
-        if(this==obj) {
-            return true;
-        }
-        if (obj instanceof IEMDefinition) {
-            return compareTo((IEMDefinition) obj) == 0;
-        }
-        if (obj instanceof IEMStack) {
-            return compareTo(((IEMStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Internal amounts should be also hashed
-        int hash = -(getSubParticles().size() << 4);
-        for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
-            int amount=(int) stack.getAmount();
-            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
-        }
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return getLocalizedName()+ '\n' + getSymbol();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
deleted file mode 100644
index 587affd0f1..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import net.minecraft.client.Minecraft;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-
-import static com.github.technus.tectech.util.Util.areBitsSet;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!  (-1 to 32 can be assumed as used)
- */
-public abstract class EMPrimitive extends EMComplex {
-    public static final byte nbtType = (byte) 'p';
-
-    private static final Map<Integer, EMPrimitive> bindsBO = new HashMap<>();
-
-    public static Map<Integer, EMPrimitive> getBindsPrimitive() {
-        return bindsBO;
-    }
-
-    private final String name;
-    private final String symbol;
-    //float-mass in eV/c^2
-    private final double mass;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    private final int    charge;
-    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private final byte   color;
-    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
-    private final byte type;
-
-    private EMPrimitive anti;//IMMUTABLE
-    private EMDecay[]   elementalDecays;
-    private byte                naturalDecayInstant;
-    private byte energeticDecayInstant;
-    private double rawLifeTime;
-
-    private final int ID;
-
-    //no _ at end - normal particle
-    //   _ at end - anti particle
-    //  __ at end - self is antiparticle
-
-    protected EMPrimitive(String name, String symbol, int type, double mass, int charge, int color, int ID) {
-        this.name = name;
-        this.symbol = symbol;
-        this.type = (byte) type;
-        this.mass = mass;
-        this.charge = charge;
-        this.color = (byte) color;
-        this.ID = ID;
-        if (bindsBO.put(ID, this) != null) {
-            Minecraft.getMinecraft().crashed(new CrashReport("Primitive definition", new EMException("Duplicate ID")));
-        }
-        STACKS_REGISTERED.add(this);
-    }
-
-    //
-    protected void init(EMPrimitive antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
-        anti = antiParticle;
-        this.rawLifeTime = rawLifeTime;
-        naturalDecayInstant = (byte) naturalInstant;
-        energeticDecayInstant = (byte) energeticInstant;
-        elementalDecays =elementalDecaysArray;
-    }
-
-    @Override
-    public String getLocalizedName() {
-        return "Undefined: " + getName();
-    }
-
-    @Override
-    public String getSymbol() {
-        return symbol;
-    }
-
-    @Override
-    public String getShortSymbol() {
-        return getSymbol();
-    }
-
-    @Override
-    public IEMDefinition getAnti() {
-        return anti;//no need for copy
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    @Override
-    public byte getColor() {
-        return color;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public EMDecay[] getNaturalDecayInstant() {
-        if (naturalDecayInstant < 0) {
-            return elementalDecays;
-        }else if (naturalDecayInstant>=elementalDecays.length){
-            return EMDecay.NO_PRODUCT;
-        }
-        return new EMDecay[]{elementalDecays[naturalDecayInstant]};
-    }
-
-    @Override
-    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
-        if (energeticDecayInstant < 0) {
-            return elementalDecays;
-        }else if (energeticDecayInstant>=elementalDecays.length){
-            return EMDecay.NO_PRODUCT;
-        }
-        return new EMDecay[]{elementalDecays[energeticDecayInstant]};
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public EMDecay[] getDecayArray() {
-        return elementalDecays;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return rawLifeTime;
-    }
-
-    @Override
-    public final EMConstantStackMap getSubParticles() {
-        return null;
-    }
-
-    @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    @Override
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        nbt.setInteger("c", getID());
-        return nbt;
-    }
-
-    public static EMPrimitive fromNBT(NBTTagCompound content) {
-        EMPrimitive primitive = bindsBO.get(content.getInteger("c"));
-        return primitive == null ? null__ : primitive;
-    }
-
-    @Override
-    public final byte getClassType() {
-        return -128;
-    }
-
-    public static byte getClassTypeStatic(){
-        return -128;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+ getLocalizedName());
-            lines.add("SYMBOL = "+getSymbol());
-        }
-        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
-        }
-    }
-
-    public static void run() {
-        try {
-            EMComplex.addCreatorFromNBT(nbtType, EMPrimitive.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-128);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Primitive " + nbtType + ' ' + -128);
-        }
-    }
-
-    @Override
-    public final int compareTo(IEMDefinition o) {
-        if (getClassType() == o.getClassType()) {
-            int oID = ((EMPrimitive) o).getID();
-            return Integer.compare(getID(), oID);
-        }
-        return compareClassID(o);
-    }
-
-    @Override
-    public final int hashCode() {
-        return getID();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getID() {
-        return ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
deleted file mode 100644
index 7ae6d0395c..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-/**
- * Created by danie_000 on 11.11.2016.
- */
-public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IMMUTABLE
-    double STABLE_RAW_LIFE_TIME =1.5e36D;
-    double NO_DECAY_RAW_LIFE_TIME=-1D;
-    long DEFAULT_ENERGY_LEVEL=0;
-    double DEFAULT_ENERGY_REQUIREMENT=25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
-
-    //Nomenclature
-    String getLocalizedName();
-
-    String getSymbol();
-
-    String getShortSymbol();
-
-    void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    byte getType();
-
-    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
-
-    //Not dynamically changing stuff
-    IEMDefinition getAnti();//gives new anti particle def
-
-    EMDecay[] getDecayArray();//possible decays
-
-    EMDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
-
-    EMDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
-
-    boolean usesSpecialEnergeticDecayHandling();
-
-    boolean usesMultipleDecayCalls(long energyLevel);
-
-    boolean decayMakesEnergy(long energyLevel);
-
-    boolean fusionMakesEnergy(long energyLevel);
-
-    double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
-
-    double getMass();//mass... MeV/c^2
-
-    int getCharge();//charge 1/3 electron charge
-
-    //dynamically changing stuff
-    byte getColor();//-1 nope cannot 0 it can but undefined
-
-    double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
-
-    boolean isTimeSpanHalfLife();
-
-    EMConstantStackMap getSubParticles();//contents... null if none
-
-    EMFluidDequantizationInfo someAmountIntoFluidStack();
-
-    EMItemDequantizationInfo someAmountIntoItemsStack();
-
-    EMOredictDequantizationInfo someAmountIntoOredictStack();
-
-    NBTTagCompound toNBT();
-
-    EMDefinitionStack getStackForm(double amount);
-
-    IEMDefinition clone();
-
-    default int compareClassID(IEMDefinition obj) {
-        return (int) getClassType() - obj.getClassType();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
index fca79b0b6f..d6f6731aec 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
@@ -1,7 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraft.item.ItemStack;
@@ -12,7 +13,6 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
 import static java.lang.Math.pow;
 
 /**
@@ -72,15 +72,13 @@ public class EMTransformationInfo {
     public void addFluid(IEMStack em, FluidStack fluidStack){
         getFluidQuantization().put(fluidStack.getFluidID(),new EMFluidQuantizationInfo(fluidStack,em));
         getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluidStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addFluid(IEMStack em, Fluid fluid, int fluidAmount){
         getFluidQuantization().put(fluid.getID(),new EMFluidQuantizationInfo(fluid,fluidAmount,em));
         getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluid,fluidAmount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     private void addItemQuantization(EMItemQuantizationInfo aIQI){
@@ -90,36 +88,31 @@ public class EMTransformationInfo {
     public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT){
         addItemQuantization(new EMItemQuantizationInfo(itemStack,skipNBT,em));
         getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,itemStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
         addItemQuantization(new EMItemQuantizationInfo(prefix,material,amount,skipNBT,em));
         getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,prefix,material,amount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addOredict(IEMStack em, String name, int qty){
         getOredictQuantization().put(OreDictionary.getOreID(name),new EMOredictQuantizationInfo(name,qty,em));
         getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,name,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty){
         getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + material.mName),new EMOredictQuantizationInfo(prefix,material,qty,em));
         getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,material,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty){
         getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + materialName),new EMOredictQuantizationInfo(prefix,materialName,qty,em));
         getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,materialName,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 77ac6c46c4..666249f408 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -3,13 +3,14 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
@@ -25,7 +26,6 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.*;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
@@ -37,7 +37,7 @@ import static gregtech.api.enums.OrePrefixes.dust;
 /**
  * Created by danie_000 on 18.11.2016.
  */
-public final class EMAtomDefinition extends EMComplex {
+public final class EMAtomDefinition extends EMComplexTemplate {
     public static final long ATOM_COMPLEXITY_LIMIT=65536L;
     private static final byte BYTE_OFFSET=32;
 
@@ -118,10 +118,10 @@ public final class EMAtomDefinition extends EMComplex {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             mass += stack.getMass();
-            if (def.getType() < 0) {
+            if (def.getMatterType() < 0) {
                 containsAnti = true;
             }
-            type = Math.max(type, Math.abs(def.getType()));
+            type = Math.max(type, Math.abs(def.getMatterType()));
 
             if (def instanceof EMLeptonDefinition) {
                 cLeptons += stack.getCharge();
@@ -307,7 +307,7 @@ public final class EMAtomDefinition extends EMComplex {
     }
 
     @Override
-    public byte getType() {
+    public byte getMatterType() {
         return type;
     }
 
@@ -340,7 +340,7 @@ public final class EMAtomDefinition extends EMComplex {
         int element = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
-            if (Math.abs(getType()) != 1) {
+            if (Math.abs(getMatterType()) != 1) {
                 return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
             }
             return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
@@ -408,7 +408,7 @@ public final class EMAtomDefinition extends EMComplex {
     }
 
     private EMDecay[] getDecayArray(ArrayList<EMDecay> decaysList, int decayMode, boolean tryAnti) {//todo?
-        if (getType() == 1) {
+        if (getMatterType() == 1) {
             switch (decayMode) {
                 case -2:
                     if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
@@ -446,7 +446,7 @@ public final class EMAtomDefinition extends EMComplex {
                     }
             }
             return EMDecay.NO_DECAY;
-        }else if(getType() ==-1){
+        }else if(getMatterType() ==-1){
             EMAtomDefinition anti =getAnti();
             if(anti!=null) {
                 return anti.getDecayArray(decaysList, decayMode, false);
@@ -1264,7 +1264,7 @@ public final class EMAtomDefinition extends EMComplex {
         //disembody
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
-            if (elementalStack.getDefinition().getType() == 1 || elementalStack.getDefinition().getType() == -1) {
+            if (elementalStack.getDefinition().getMatterType() == 1 || elementalStack.getDefinition().getMatterType() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(elementalStack);
             } else {
@@ -1344,8 +1344,8 @@ public final class EMAtomDefinition extends EMComplex {
     }
 
     @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, elementalStacks);
+    protected int getIndirectTagValue() {
+        return nbtType;
     }
 
     public static EMAtomDefinition fromNBT(NBTTagCompound nbt) {
@@ -1465,14 +1465,14 @@ public final class EMAtomDefinition extends EMComplex {
         }
 
         try {
-            EMComplex.addCreatorFromNBT(nbtType, EMAtomDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)64);
+            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMAtomDefinition::fromNBT,EMAtomDefinition.class,getClassTypeStatic());
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
         if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + 64);
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
@@ -1644,7 +1644,7 @@ public final class EMAtomDefinition extends EMComplex {
 
     @Override
     public byte getClassType() {
-        return 64;
+        return getClassTypeStatic();
     }
 
     public static byte getClassTypeStatic(){
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index 384087770f..a901f5c8fc 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -1,17 +1,20 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.*;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
-import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import com.github.technus.tectech.util.Util;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -22,7 +25,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
@@ -33,7 +35,7 @@ import static gregtech.api.enums.OrePrefixes.dust;
 /**
  * Created by danie_000 on 17.11.2016.
  */
-public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
+public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i/o
     private final int hash;
 
     private static final byte                           nbtType    = (byte) 'h';
@@ -90,8 +92,8 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
             }
             mass += quarkStack.getMass();
             charge += quarkStack.getCharge();
-            type = Math.max(Math.abs(quarkStack.getDefinition().getType()), type);
-            if (quarkStack.getDefinition().getType() < 0) {
+            type = Math.max(Math.abs(quarkStack.getDefinition().getMatterType()), type);
+            if (quarkStack.getDefinition().getMatterType() < 0) {
                 containsAnti = true;
             }
         }
@@ -212,12 +214,12 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     @Override
     public EMDecay[] getNaturalDecayInstant() {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
             return EMDecay.NO_PRODUCT;
         }
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack quarks : quarkStacks) {
-            if (quarks.getDefinition().getType() == 1 || quarks.getDefinition().getType() == -1) {
+            if (quarks.getDefinition().getMatterType() == 1 || quarks.getDefinition().getMatterType() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(quarks);
             } else {
@@ -234,7 +236,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
             return EMDecay.NO_PRODUCT;
         }
         return new EMDecay[]{new EMDecay(0.75D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
@@ -270,7 +272,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (getAmount() == 2 && quarkStacks.length == 2 &&
                 quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() &&
-                quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+                quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
             return EMDecay.NO_PRODUCT;
         } else if (getAmount() != 3) {
             return new EMDecay[]{new EMDecay(0.95D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
@@ -286,7 +288,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
             EMQuarkDefinition lastQuark = newBaryon.remove(2);
 
             EMDefinitionStack[] decay;
-            if (Math.abs(lastQuark.getType()) > 1) {
+            if (Math.abs(lastQuark.getMatterType()) > 1) {
                 decay = lastQuark.getDecayArray()[1].getOutputStacks().valuesToArray();
             } else {
                 decay = lastQuark.getDecayArray()[2].getOutputStacks().valuesToArray();
@@ -334,7 +336,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     }
 
     @Override
-    public byte getType() {
+    public byte getMatterType() {
         return type;
     }
 
@@ -385,8 +387,8 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     }
 
     @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, quarkStacks);
+    protected int getIndirectTagValue() {
+        return nbtType;
     }
 
     public static EMHadronDefinition fromNBT(NBTTagCompound nbt) {
@@ -412,22 +414,22 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
             SYMBOL_MAP.put(hadron_p,"p");
             NAME_MAP.put(hadron_p,"Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p);
             hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
             SYMBOL_MAP.put(hadron_p_,"~p");
             NAME_MAP.put(hadron_p_,"Anti Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p_);
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.getMass();
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
             NAME_MAP.put(hadron_n, "Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n);
             hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
             SYMBOL_MAP.put(hadron_n_,"~n");
             NAME_MAP.put(hadron_n_,"Anti Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n_);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n_);
         } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -444,14 +446,14 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
         hadron_p5 = new EMDefinitionStack(hadron_p, 5D);
 
         try {
-            EMComplex.addCreatorFromNBT(nbtType, EMHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64);
+            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMHadronDefinition::fromNBT,EMHadronDefinition.class,getClassTypeStatic());
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
         if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + -64);
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
@@ -467,7 +469,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
 
     @Override
     public byte getClassType() {
-        return -64;
+        return getClassTypeStatic();
     }
 
     public static byte getClassTypeStatic(){
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
index 9a22f54941..bd34733cb6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.TreeMap;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.util.Util.splitButDifferent;
 
 public final class EMNuclideIAEA {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index e3efa3b7e6..5f14eefcdb 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
@@ -11,7 +11,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMBosonDefinition extends EMPrimitive {
+public final class EMBosonDefinition extends EMPrimitiveTemplate {
     public static final EMBosonDefinition
             boson_Y__ = new EMBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
             boson_H__ = new EMBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index 98bdf7ca5c..0f9898775f 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
@@ -11,7 +11,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMLeptonDefinition extends EMPrimitive {
+public final class EMLeptonDefinition extends EMPrimitiveTemplate {
     public static final EMLeptonDefinition
             lepton_e = new EMLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
             lepton_m = new EMLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index e77c74ed89..ac06a80728 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -2,14 +2,14 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMNeutrinoDefinition extends EMPrimitive {
+public final class EMNeutrinoDefinition extends EMPrimitiveTemplate {
     public static final EMNeutrinoDefinition
             lepton_Ve = new EMNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
             lepton_Vm = new EMNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index 68591cc4e6..e4a92fbae1 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -1,17 +1,17 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMPrimitiveDefinition extends EMPrimitive {
+public final class EMPrimitiveDefinition extends EMPrimitiveTemplate {
     public static final EMPrimitiveDefinition
-            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, Integer.MIN_VALUE+10_000),
-            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MAX_VALUE-10_000),
-            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, 0),
+            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, 0),
+            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MIN_VALUE),
+            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, Integer.MIN_VALUE+1),
             magic = new EMPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
             magic_ = new EMPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index b0a5c419e1..9afa04d243 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
@@ -9,7 +9,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMQuarkDefinition extends EMPrimitive {
+public final class EMQuarkDefinition extends EMPrimitiveTemplate {
     public static final EMQuarkDefinition
             quark_u = new EMQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
             quark_c = new EMQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index f5cfad22f3..b7310485a2 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,11 +1,11 @@
 package com.github.technus.tectech.recipe;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.item.ItemStack;
@@ -262,7 +262,7 @@ public class TT_recipe extends GT_Recipe {
                 return null;
             }
             try {
-                return mRecipeMap.get(EMComplex.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
+                return mRecipeMap.get(EMDefinitionsRegistry.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
             }catch (Exception e){
                 if (DEBUG_MODE) {
                     e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index bb18c16727..599d3e1c2c 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.recipe;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index 107cb97103..2062173cfd 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.thing.item;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
@@ -7,7 +8,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance
 import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -26,7 +27,6 @@ import net.minecraft.world.World;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.TreeSet;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
@@ -39,7 +39,6 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  * Created by Tec on 15.03.2017.
  */
 public final class DebugElementalInstanceContainer_EM extends Item implements IElementalItem {
-    public static final TreeSet<IEMDefinition> STACKS_REGISTERED =new TreeSet<>();
 
     public static DebugElementalInstanceContainer_EM INSTANCE;
 
@@ -141,7 +140,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         ItemStack that = new ItemStack(this, 1);
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
-        for(IEMDefinition definition: STACKS_REGISTERED){
+        for(IEMDefinition definition: EMDefinitionsRegistry.getStacksRegisteredForDisplay()){
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT))));
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 144 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_144))));
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1000 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index 4a0bb55784..3015d024c7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -8,7 +8,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayRe
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
@@ -108,7 +108,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         });
         registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
         registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(EMPrimitive.getClassTypeStatic());
+        registerSimpleAtomFuse(EMPrimitiveTemplate.getClassTypeStatic());
 
         FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
             @Override
@@ -135,7 +135,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 return 2;
             }
         });
-        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
             @Override
             public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
@@ -162,9 +162,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         });
 
         registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAspectFuse(EMPrimitive.getClassTypeStatic());
+        registerSimpleAspectFuse(EMPrimitiveTemplate.getClassTypeStatic());
 
-        FUSE_HANDLERS.put((EMPrimitive.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMPrimitiveTemplate.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
             @Override
             public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 466f82071b..e769d3e480 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -26,7 +26,7 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 630569a25d..64949fe402 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -29,8 +29,8 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.DEFAULT_ENERGY_LEVEL;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.DEFAULT_ENERGY_LEVEL;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
-- 
cgit 


From 975bf105794ac48b1415d4e78946449fbb68bcaf Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 18 Jan 2022 22:25:23 +0100
Subject: Cleanup some Locale

---
 .../tectech/loader/recipe/RecipeLoader.java        |  2 +-
 .../core/definitions/EMPrimitiveTemplate.java      | 11 +++++-----
 .../definitions/complex/EMAtomDefinition.java      |  7 +++---
 .../definitions/complex/EMHadronDefinition.java    | 25 +++++++++++-----------
 .../definitions/primitive/EMBosonDefinition.java   |  3 ++-
 .../definitions/primitive/EMLeptonDefinition.java  |  3 ++-
 .../primitive/EMNeutrinoDefinition.java            |  3 ++-
 .../primitive/EMPrimitiveDefinition.java           |  3 ++-
 .../definitions/primitive/EMQuarkDefinition.java   |  3 ++-
 9 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
index 3572e601e4..b5333c8e0d 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
@@ -35,7 +35,7 @@ public class RecipeLoader implements Runnable {
 
     @Override
     public void run() {
-        EMAtomDefinition.setTransformation();
+        EMAtomDefinition.setTransformations();
         EMHadronDefinition.setTransformations();
 
         // ===================================================================================================
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index f3ce34dd1d..b529b79cc0 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
@@ -61,11 +62,6 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         EMDefinitionsRegistry.registerForDisplay(this);
     }
 
-    @Override
-    public String getLocalizedName() {
-        return "Undefined: " + getName();
-    }
-
     @Override
     public String getSymbol() {
         return symbol;
@@ -183,6 +179,11 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         return nbt;
     }
 
+    @Override
+    protected final int getIndirectTagValue() {
+        throw new EMException("This class should only be used directly!");
+    }
+
     @Override
     public final byte getClassType() {
         return getClassTypeStatic();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 666249f408..878c2a6627 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -33,6 +33,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
 import static gregtech.api.enums.OrePrefixes.dust;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 18.11.2016.
@@ -348,7 +349,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
-            return (negative ? "Element: ~" : "Element: ") + element;
+            return translateToLocal("tt.keyword.Element")+(negative ? ": ~" : ": ") + element;
         }
     }
 
@@ -1476,7 +1477,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
     }
 
-    public static void setTransformation(){
+    public static void setTransformations(){
         /*----STABLE ATOMS----**/
         refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
 
@@ -1666,7 +1667,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
         }
         if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+ getLocalizedName());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index a901f5c8fc..70092aa735 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -31,6 +31,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static gregtech.api.enums.OrePrefixes.dust;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 17.11.2016.
@@ -141,7 +142,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     public String getLocalizedName() {
         StringBuilder name= new StringBuilder(getSimpleName());
         name.append(':');
-        String sym= NAME_MAP.get(this);
+        String sym= translateToLocal(NAME_MAP.get(this));
         if(sym!=null){
             name.append(' ').append(sym);
         }else {
@@ -155,17 +156,17 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     private String getSimpleName() {
         switch (getAmount()) {
             case 2:
-                return "Meson";
+                return translateToLocal("tt.keyword.Meson");
             case 3:
-                return "Baryon";
+                return translateToLocal("tt.keyword.Baryon");
             case 4:
-                return "Tetraquark";
+                return translateToLocal("tt.keyword.Tetraquark");
             case 5:
-                return "Pentaquark";
+                return translateToLocal("tt.keyword.Pentaquark");
             case 6:
-                return "Hexaquark";
+                return translateToLocal("tt.keyword.Hexaquark");
             default:
-                return "Hadron";
+                return translateToLocal("tt.keyword.Hadron");
         }
     }
 
@@ -413,22 +414,22 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
             SYMBOL_MAP.put(hadron_p,"p");
-            NAME_MAP.put(hadron_p,"Proton");
+            NAME_MAP.put(hadron_p,translateToLocal("tt.keyword.Proton"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p);
             hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
             SYMBOL_MAP.put(hadron_p_,"~p");
-            NAME_MAP.put(hadron_p_,"Anti Proton");
+            NAME_MAP.put(hadron_p_,translateToLocal("tt.keyword.AntiProton"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p_);
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.getMass();
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
-            NAME_MAP.put(hadron_n, "Neutron");
+            NAME_MAP.put(hadron_n,translateToLocal("tt.keyword.Neutron"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n);
             hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
             SYMBOL_MAP.put(hadron_n_,"~n");
-            NAME_MAP.put(hadron_n_,"Anti Neutron");
+            NAME_MAP.put(hadron_n_,translateToLocal("tt.keyword.AntiNeutron"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n_);
         } catch (EMException e) {
             if (DEBUG_MODE) {
@@ -491,7 +492,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
         }
         if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+getSimpleName());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index 5f14eefcdb..f20f872a6e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMP
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -35,7 +36,7 @@ public final class EMBosonDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Boson: " + getName();
+        return translateToLocal("tt.keyword.Boson")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index 0f9898775f..38e537ec59 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMP
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -59,7 +60,7 @@ public final class EMLeptonDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Lepton: " + getName();
+        return translateToLocal("tt.keyword.Lepton")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index ac06a80728..9af7b97cb4 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -5,6 +5,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefini
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -49,7 +50,7 @@ public final class EMNeutrinoDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Lepton: " + getName();
+        return translateToLocal("tt.keyword.Neutrino")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index e4a92fbae1..41da06567d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -3,6 +3,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -29,7 +30,7 @@ public final class EMPrimitiveDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Primitive: " + getName();
+        return translateToLocal("tt.keyword.Primitive")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index 9afa04d243..3f19205aeb 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -5,6 +5,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMP
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -96,7 +97,7 @@ public final class EMQuarkDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Quark: " + getName();
+        return translateToLocal("tt.keyword.Quark")+": " + getName();
     }
 
     @Override
-- 
cgit 


From 62021d238a0c38401b50211d59e72e169399f444 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 18 Jan 2022 22:33:13 +0100
Subject: Minor fixes

---
 .../elementalMatter/definitions/EMComplexAspectDefinition.java          | 2 +-
 .../mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java | 2 +-
 .../elementalMatter/definitions/complex/EMHadronDefinition.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index e56e31f166..a062fa0dab 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -48,7 +48,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     private EMComplexAspectDefinition(boolean check, EMConstantStackMap aspects) throws EMException {
         if (check && !canTheyBeTogether(aspects)) {
-            throw new EMException("Hadron Definition error");
+            throw new EMException("Complex Aspect Definition error");
         }
         aspectStacks = aspects;
         float mass = 0;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 878c2a6627..37ecb861f8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -72,7 +72,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     private final int    charge;
     //int -electric charge in 1/3rds of electron charge for optimization
     private final int    chargeLeptons;
-    private       double rawLifeTime;
+    private final double rawLifeTime;
     //generation max present inside - minus if contains any anti quark
     private final byte   type;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index 70092aa735..c1db8e4460 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -101,7 +101,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         this.amount = amount;
         this.charge = charge;
         this.type = containsAnti ? (byte) -type : (byte) type;
-        long mult = this.getAmount() * this.getAmount() * (this.getAmount() - 1);
+        long mult = (long) this.getAmount() * this.getAmount() * (this.getAmount() - 1);
         mass = mass * 5.543D * mult;//yes it becomes heavier
 
         if (mass == protonMass && this.getAmount() == 3) {
-- 
cgit 


From b5399199a88d7c6c19a2ed494aa9c66b81bf2249 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sat, 22 Jan 2022 23:33:56 +0100
Subject: Rework API, add locale

---
 .../java/com/github/technus/tectech/TecTech.java   |   19 +-
 .../dreamcraft/DreamCraftRecipeLoader.java         |    8 +-
 .../tectech/compatibility/gtpp/GtppAtomLoader.java |   68 +-
 .../blocks/turretbases/TurretBaseEM.java           |    2 +-
 .../blocks/turretheads/TurretHeadEM.java           |    2 +-
 .../entity/projectiles/projectileEM.java           |    4 +-
 .../tileentity/turret/TileTurretHeadEM.java        |    6 +-
 .../spartakcore/SpartakCoreRecipeLoader.java       |    9 +-
 .../definitions/EMComplexAspectDefinition.java     |   78 +-
 .../definitions/EMPrimalAspectDefinition.java      |   41 +-
 .../transformations/AspectDefinitionCompat.java    |    7 +-
 .../AspectDefinitionCompatEnabled.java             |   11 +-
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |    8 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |    4 +-
 .../technus/tectech/loader/ElementalLoader.java    |   29 +-
 .../github/technus/tectech/loader/MainLoader.java  |   26 +-
 .../tectech/loader/gui/CreativeTabTecTech.java     |    2 -
 .../tectech/loader/recipe/BaseRecipeLoader.java    |  125 +++
 .../tectech/loader/recipe/BloodyRecipeLoader.java  |    6 +-
 .../tectech/loader/recipe/RecipeLoader.java        |  121 --
 .../tectech/loader/thing/MachineLoader.java        |   15 +-
 .../tectech/mechanics/anomaly/AnomalyHandler.java  |   14 +-
 .../elementalMatter/core/EMException.java          |    3 -
 .../elementalMatter/core/commands/EMGive.java      |  118 +-
 .../elementalMatter/core/commands/EMList.java      |   56 +-
 .../core/definitions/EMComplexTemplate.java        |   20 +-
 .../core/definitions/EMDefinitionsRegistry.java    |  110 --
 .../core/definitions/EMPrimitiveTemplate.java      |   67 +-
 .../core/definitions/IEMDefinition.java            |   32 +-
 .../registry/EMDefinitionsRegistry.java            |  189 ++++
 .../core/definitions/registry/EMIndirectType.java  |   37 +
 .../core/definitions/registry/EMType.java          |   63 ++
 .../core/maps/EMConstantStackMap.java              |    5 +-
 .../core/maps/EMDefinitionStackMap.java            |    5 +-
 .../core/maps/EMInstanceStackMap.java              |   32 +-
 .../elementalMatter/core/maps/IEMMapRead.java      |   20 +-
 .../elementalMatter/core/maps/IEMMapWrite.java     |   12 +-
 .../core/maps/IEMMapWriteExact.java                |    6 +-
 .../core/stacks/EMDefinitionStack.java             |   10 +-
 .../core/stacks/EMInstanceStack.java               |   61 +-
 .../elementalMatter/core/stacks/IEMStack.java      |   33 +-
 .../core/transformations/EMDequantizationInfo.java |   56 +
 .../transformations/EMFluidDequantizationInfo.java |   43 -
 .../transformations/EMFluidQuantizationInfo.java   |    4 +-
 .../transformations/EMItemDequantizationInfo.java  |   45 -
 .../transformations/EMItemQuantizationInfo.java    |    4 +-
 .../EMOredictDequantizationInfo.java               |   60 -
 .../transformations/EMOredictQuantizationInfo.java |   41 +-
 .../core/transformations/EMTransformationInfo.java |  165 ---
 .../transformations/EMTransformationRegistry.java  |  134 +++
 .../core/transformations/IEMExchangeInfo.java      |   11 -
 .../core/transformations/OreDictionaryStack.java   |   19 +
 .../definitions/complex/EMAtomDefinition.java      | 1187 ++++++++++----------
 .../definitions/complex/EMHadronDefinition.java    |  229 ++--
 .../definitions/primitive/EMBosonDefinition.java   |   38 +-
 .../definitions/primitive/EMFermionDefinition.java |   16 +
 .../primitive/EMGaugeBosonDefinition.java          |   83 ++
 .../definitions/primitive/EMLeptonDefinition.java  |   43 +-
 .../primitive/EMNeutrinoDefinition.java            |   41 +-
 .../primitive/EMPrimitiveDefinition.java           |   50 +-
 .../definitions/primitive/EMQuarkDefinition.java   |   87 +-
 .../primitive/EMScalarBosonDefinition.java         |   46 +
 .../github/technus/tectech/recipe/TT_recipe.java   |   19 +-
 .../tectech/thing/block/QuantumGlassBlock.java     |    2 +-
 .../tectech/thing/casing/GT_Block_CasingsNH.java   |    2 +-
 .../tectech/thing/casing/GT_Block_CasingsTT.java   |    2 +-
 .../tectech/thing/casing/GT_Block_HintTT.java      |    2 +-
 .../technus/tectech/thing/item/AvrProgrammer.java  |    2 +-
 .../thing/item/ConstructableTriggerItem.java       |    2 +-
 .../item/DebugElementalInstanceContainer_EM.java   |   32 +-
 .../item/ElementalDefinitionContainer_EM.java      |   11 +-
 .../item/ElementalDefinitionScanStorage_EM.java    |    2 +-
 .../technus/tectech/thing/item/EuMeterGT.java      |    2 +-
 .../thing/item/FrontRotationTriggerItem.java       |    2 +-
 .../tectech/thing/item/ParametrizerMemoryCard.java |    2 +-
 .../tectech/thing/metaTileEntity/Textures.java     |    2 +-
 ...GT_MetaTileEntity_Hatch_ElementalContainer.java |    8 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       |  717 ------------
 .../multi/GT_MetaTileEntity_EM_decay.java          |    4 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |   49 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   11 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        |   10 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |    4 +-
 .../em_collider/GT_MetaTileEntity_EM_collider.java |  709 ++++++++++++
 .../multi/em_collider/IColliderHandler.java        |    5 +
 .../em_collider/IPrimitiveColliderHandler.java     |    8 +
 .../multi/em_machine/Behaviour_Centrifuge.java     |    7 +-
 .../Behaviour_ElectromagneticSeparator.java        |    9 +-
 .../github/technus/tectech/util/DoubleCount.java   |    6 +
 .../java/com/github/technus/tectech/util/Util.java |   12 +
 src/main/resources/assets/tectech/lang/en_US.lang  |  103 +-
 91 files changed, 2929 insertions(+), 2703 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
 delete mode 100644 src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
 create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
 create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java
 create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index ef5e146bfa..d730d64a65 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech;
 
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.TecTechConfig;
+import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
 import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler;
 import com.github.technus.tectech.mechanics.anomaly.CancerCommand;
 import com.github.technus.tectech.mechanics.anomaly.ChargeCommand;
@@ -11,6 +12,8 @@ import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerPersistence;
 import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMGive;
 import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMList;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.proxy.CommonProxy;
 import com.github.technus.tectech.util.XSTR;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -41,7 +44,8 @@ public class TecTech {
     public static TecTech instance;
 
     public static final XSTR RANDOM = XSTR.XSTR_INSTANCE;
-    public static final LogHelper LOGGER = new LogHelper(Reference.MODID);
+    public static final LogHelper          LOGGER = new LogHelper(Reference.MODID);
+    public static       CreativeTabTecTech creativeTabTecTech;
 
     private static IngameErrorLog moduleAdminErrorLogs;
     public static TecTechConfig configTecTech;
@@ -50,6 +54,9 @@ public class TecTech {
     public static AnomalyHandler anomalyHandler;
     public static PlayerPersistence playerPersistence;
 
+    public static final EMDefinitionsRegistry    definitionsRegistry =new EMDefinitionsRegistry();
+    public static final EMTransformationRegistry transformationInfo  =new EMTransformationRegistry();
+
     /**
      * For Loader.isModLoaded checks during the runtime
      */
@@ -106,7 +113,7 @@ public class TecTech {
                 Field field= GT_Proxy.class.getDeclaredField("mEvents");
                 field.setAccessible(true);
                 modifiersField.setInt( field, field.getModifiers() & ~Modifier.FINAL );
-                field.set(GT_Mod.gregtechproxy, new Collection() {
+                field.set(GT_Mod.gregtechproxy, new Collection<Object>() {
                     @Override
                     public int size() {
                         return 0;
@@ -123,8 +130,8 @@ public class TecTech {
                     }
 
                     @Override
-                    public Iterator iterator() {
-                        return new Iterator() {
+                    public Iterator<Object> iterator() {
+                        return new Iterator<Object>() {
                             @Override
                             public boolean hasNext() {
                                 return false;
@@ -188,13 +195,13 @@ public class TecTech {
 
         }
 
-        MainLoader.load();
+        MainLoader.load(definitionsRegistry);
         MainLoader.addAfterGregTechPostLoadRunner();
     }
 
     @Mod.EventHandler
     public void PostLoad(FMLPostInitializationEvent PostEvent) {
-        MainLoader.postLoad();
+        MainLoader.postLoad(definitionsRegistry,transformationInfo);
 
         chunkDataHandler.registerChunkMetaDataHandler(anomalyHandler=new AnomalyHandler());
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 00b31915c2..4ebe84147f 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.compatibility.dreamcraft;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -23,12 +24,12 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.lang.reflect.Method;
 
-import static com.github.technus.tectech.loader.recipe.RecipeLoader.getOrDefault;
+import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault;
 
 /**
  * Created by Tec on 06.08.2017.
  */
-public class DreamCraftRecipeLoader implements Runnable {
+public class DreamCraftRecipeLoader {
     //region reflect a bit
     @SuppressWarnings("rawtypes")
     private Class CUSTOM_ITEM_LIST;
@@ -48,8 +49,7 @@ public class DreamCraftRecipeLoader implements Runnable {
     }
     //endregion
 
-    @Override
-    public void run() {
+    public void run(EMTransformationRegistry transformationInfo) {
         //region reflect a bit
         try {
             CUSTOM_ITEM_LIST = Class.forName("com.dreammaster.gthandler.CustomItemList");
diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index ee7d293e08..67a363fc6c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -1,18 +1,19 @@
 package com.github.technus.tectech.compatibility.gtpp;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.lang.reflect.Method;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getBestUnstableIsotope;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getFirstStableIsotope;
 
-public class GtppAtomLoader implements Runnable{
+public class GtppAtomLoader {
     //region reflect a bit
-    private Class ELEMENT;
+    private Class<?> ELEMENT;
     private Object ELEMENT_INSTANCE;
     private Method getUnlocalizedName,getFluid,generate;
 
@@ -41,14 +42,13 @@ public class GtppAtomLoader implements Runnable{
     }
     //endregion
 
-    @Override
-    public void run() {
+    public void setTransformations(EMTransformationRegistry transformationInfo) {
         //region reflect a bit
         try{
             ELEMENT=Class.forName("gtPlusPlus.core.material.ELEMENT");
             ELEMENT_INSTANCE=ELEMENT.getMethod("getInstance").invoke(null);
 
-            Class clazz=Class.forName("gtPlusPlus.core.material.Material");
+            Class<?> clazz=Class.forName("gtPlusPlus.core.material.Material");
             getUnlocalizedName=clazz.getMethod("getUnlocalizedName");
             getFluid=clazz.getMethod("getFluid", int.class);
 
@@ -59,34 +59,34 @@ public class GtppAtomLoader implements Runnable{
         }
         //endregion
 
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), getFluid("NEON",144));
         generate("GERMANIUM",true,true);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(35), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), getFluid("BROMINE",144));
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(36), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), getFluid("KRYPTON",144));
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),getFluid("XENON",144));
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
 
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(85), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
 
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(96), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(97), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(98), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(99), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(100), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
index 9da3b82b40..654b4e37a6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase;
 import openmodularturrets.handler.ConfigHandler;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by Tec on 27/07/2017.
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
index 7b7167b915..da212d4853 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
@@ -11,7 +11,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import openmodularturrets.tileentity.turretbase.TurretBase;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by Tec on 27/07/2017.
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index 785b59f093..54bd3aaea5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -52,10 +52,10 @@ public class projectileEM extends LaserProjectile {
             charge=projectileContent.getCharge();
             massFactor =(float) (projectileContent.getDefinition().getMass()/ EMHadronDefinition.hadron_n_.getMass());
 
-            if(projectileContent.getDefinition().getMatterType()>1 || projectileContent.getDefinition().getMatterType()<-1) {
+            if(projectileContent.getDefinition().getGeneration()>1 || projectileContent.getDefinition().getGeneration()<-1) {
                 strange = true;
             }
-            if(projectileContent.getDefinition().getMatterType()<0) {
+            if(projectileContent.getDefinition().getGeneration()<0) {
                 antiMatter = true;
             }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 6dc5c4f60a..742232d8c6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -14,7 +14,7 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 
 /**
  * Created by Bass on 27/07/2017.
@@ -71,8 +71,8 @@ public class TileTurretHeadEM extends TurretHead{
             return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
         }
         EMInstanceStack stack  = hatchContentPointer.getRandom();
-        double          amount = Math.min(AVOGADRO_CONSTANT, stack.getAmount());
-        hatchContentPointer.removeAmount(stack.getDefinition(),AVOGADRO_CONSTANT);
+        double          amount = Math.min(EM_COUNT_PER_MATERIAL_AMOUNT, stack.getAmount());
+        hatchContentPointer.removeAmount(stack.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT);
         stack=stack.clone();
         stack.setAmount(amount);
         return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
diff --git a/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java
index 3fabfd67b2..b2050bbac5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.compatibility.spartakcore;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -19,15 +20,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import static com.github.technus.tectech.loader.recipe.RecipeLoader.getOrDefault;
+import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault;
 
 /**
  * Created by Spartak1997 on 28.07.2019.
  */
-public class SpartakCoreRecipeLoader implements Runnable {
-    
-    @Override
-    public void run() {
+public class SpartakCoreRecipeLoader {
+    public void run(EMTransformationRegistry transformationInfo) {
         
       //Quantum Glass
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index a062fa0dab..40419604e4 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -2,24 +2,21 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
-import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
-import net.minecraft.nbt.NBTTagCompound;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.util.Util;
 
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -30,7 +27,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     private final int    hash;
     private final double mass;
 
-    private static final byte nbtType = (byte) 'c';
+    private static final String nbtType = "`";
 
     private final EMConstantStackMap aspectStacks;
 
@@ -76,7 +73,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     @Override
     public String getLocalizedName() {
-        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this);
+        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
         if (name != null) {
             name = name.substring(0, 1).toUpperCase() + name.substring(1);
         } else {
@@ -124,25 +121,10 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     }
 
     @Override
-    protected int getIndirectTagValue() {
+    protected String getIndirectTagValue() {
         return nbtType;
     }
 
-    public static EMComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
-        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new EMComplexAspectDefinition(stacks);
-        } catch (EMException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
     @Override
     public double getRawTimeSpan(long currentEnergy) {
         return -1;
@@ -159,12 +141,12 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getMatterType() {
+    public int getGeneration() {
         return 0;
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return -1;
     }
 
@@ -175,7 +157,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
-        return new EMDecay[]{new EMDecay(0.75F, aspectStacks), EMBosonDefinition.deadEnd};
+        return new EMDecay[]{new EMDecay(0.75F, aspectStacks), deadEnd};
     }
 
     @Override
@@ -218,45 +200,25 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
         return mass;
     }
 
-    @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
     @Override
     public IEMDefinition getAnti() {
         return null;
     }
 
-    public static void run() {
-        try {
-            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMComplexAspectDefinition::fromNBT,EMComplexAspectDefinition.class, getClassTypeStatic());
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(nbtType, new EMIndirectType((definitionsRegistry, nbt)->
+                new EMComplexAspectDefinition(EMConstantStackMap.fromNBT(definitionsRegistry,nbt)), EMComplexAspectDefinition.class, "tt.keyword.Aspect"));
         if (DEBUG_MODE) {
             TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
     @Override
-    public byte getClassType() {
+    public int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic() {
+    public static int getClassTypeStatic() {
         return -96;
     }
 
@@ -275,7 +237,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType());
+            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getMatterMassType());
         }
         if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.NAME") + " = " + getLocalizedName());
@@ -285,7 +247,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
             lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
         }
         if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
-            lines.add(getColor() < 0 ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
+            lines.add(hasColor() ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
         }
         if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
index e62c2e5278..885a71ef28 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -1,6 +1,9 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
 
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -10,29 +13,35 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     public static final EMPrimalAspectDefinition
-            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
-            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
-            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 33),
-            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 32),
-            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 30),
-            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Entropy"), "e`", 1e5D, 31);
+            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 45,"a`"),
+            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 44,"e`"),
+            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 43,"f`"),
+            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 42,"w`"),
+            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 40,"o`"),
+            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Chaos"), "c`", 1e5D, 41,"c`");
 
-    private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID) {
-        super(name, symbol, 0, mass, 0, -1, ID);
+    private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID,String bind) {
+        super(name, symbol, 0, mass, 0, -1, ID,bind);
     }
 
-    public static void run() {
-        magic_air.init(null, -1F, -1, -1, NO_DECAY);
-        magic_earth.init(null, -1F, -1, -1, NO_DECAY);
-        magic_fire.init(null, -1F, -1, -1, NO_DECAY);
-        magic_water.init(null, -1F, -1, -1, NO_DECAY);
-        magic_order.init(null, -1F, -1, -1, NO_DECAY);
-        magic_entropy.init(null, -1F, -1, -1, NO_DECAY);
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMPrimalAspectDefinition.class,"tt.keyword.Primal"));
+        magic_air.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_earth.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_fire.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_water.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_order.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_entropy.init(registry,null, -1F, -1, -1, NO_DECAY);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Primal") + ": " + getName();
+        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
+        if (name != null) {
+            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName()+" ("+name+")";
+        } else {
+            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName();
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
index a4328d2e03..c1c6c6dcb2 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.tran
 
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 
 import java.util.HashMap;
 
@@ -13,12 +14,16 @@ public class AspectDefinitionCompat {
     private final HashMap<IEMDefinition,String>  defToAspect = new HashMap<>();
     private final HashMap<String, IEMDefinition> aspectToDef = new HashMap<>();
 
-    public void run(){}
+    public void run(EMDefinitionsRegistry registry){}
 
     public String getAspectTag(IEMDefinition definition){
         return null;
     }
 
+    public String getAspectLocalizedName(IEMDefinition definition){
+        return null;
+    }
+
     public IEMDefinition getDefinition(String aspect){
         return null;
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
index ead8a5fdef..ccccff7c3d 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -2,20 +2,20 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.tran
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import thaumcraft.api.aspects.Aspect;
 
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry.STACKS_REGISTERED;
 
 /**
  * Created by Tec on 21.05.2017.
  */
 public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
     @Override
-    public void run(){
+    public void run(EMDefinitionsRegistry registry){
         getDefToAspect().put(magic_air,"aer");
         getDefToAspect().put(magic_earth,"terra");
         getDefToAspect().put(magic_fire,"ignis");
@@ -51,6 +51,7 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                             }
                             getAspectToDef().put(aspect.getTag(),newAspect);
                             getDefToAspect().put(newAspect,aspect.getTag());
+                            registry.registerForDisplay(newAspect);
                         }catch (EMException e) {
                             /**/
                         }finally {
@@ -60,7 +61,6 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                 }
             }
         }
-        STACKS_REGISTERED.addAll(getDefToAspect().keySet());
     }
 
     @Override
@@ -68,6 +68,11 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
         return getDefToAspect().get(definition);
     }
 
+    public String getAspectLocalizedName(IEMDefinition definition){
+        Aspect aspect = Aspect.aspects.get(getAspectTag(definition));
+        return aspect != null ? aspect.getName() : null;
+    }
+
     @Override
     public IEMDefinition getDefinition(String aspect) {
         return getAspectToDef().get(aspect);
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index dbcbe7d86b..267af79784 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -26,8 +26,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_ITEM_DIMINISHED;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -100,7 +100,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
         }
 
         EMInstanceStack stack = inputHatchContainer.getRandom();
-        if (stack.getAmount() < AVOGADRO_CONSTANT_DIMINISHED) {
+        if (stack.getAmount() < EM_COUNT_PER_ITEM_DIMINISHED) {
             cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
             mEUt = (int) -V[6];
         } else {
@@ -111,7 +111,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
                 cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
                 mEUt = (int) -V[7];
             } else {
-                inputHatchContainer.removeAmount(stack.getDefinition().getStackForm(AVOGADRO_CONSTANT));
+                inputHatchContainer.removeAmount(stack.getDefinition().getStackForm(EM_COUNT_PER_MATERIAL_AMOUNT));
                 if (aspect.isPrimal()) {
                     mEUt = (int) -V[8];
                 } else {
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 5fe8c973fe..a381a37f89 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -25,7 +25,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -90,7 +90,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
             mEfficiencyIncrease = 10000;
             eAmpereFlow = 1;
             outputEM = new EMInstanceStackMap[]{
-                    new EMInstanceStackMap(new EMInstanceStack(definition,AVOGADRO_CONSTANT))
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))
             };
             if (definition instanceof EMPrimalAspectDefinition) {
                 mEUt = (int) -V[8];
diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index 61989e7b13..773361bd0f 100644
--- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -2,36 +2,33 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMNuclideIAEA;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.*;
 
 /**
  * Created by danie_000 on 16.11.2016.
  */
-public class ElementalLoader implements Runnable {
-    @Override
-    public void run() {
+public class ElementalLoader {
+    public void run(EMDefinitionsRegistry registry) {
         // ===================================================================================================
         // Definition init
         // ===================================================================================================
 
-        EMPrimitiveDefinition.run();
+        EMPrimitiveDefinition.run(registry);
 
-        EMQuarkDefinition.run();
-        EMLeptonDefinition.run();
-        EMNeutrinoDefinition.run();
-        EMBosonDefinition.run();
+        EMQuarkDefinition.run(registry);
+        EMLeptonDefinition.run(registry);
+        EMNeutrinoDefinition.run(registry);
+        EMGaugeBosonDefinition.run(registry);
+        EMScalarBosonDefinition.run(registry);
 
-        EMHadronDefinition.run();
+        EMHadronDefinition.run(registry);
 
-        EMNuclideIAEA.run();
+        EMAtomDefinition.run(registry);
 
-        EMAtomDefinition.run();
-
-        EMPrimalAspectDefinition.run();
-
-        EMComplexAspectDefinition.run();
+        EMPrimalAspectDefinition.run(registry);
+        EMComplexAspectDefinition.run(registry);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index b3c8d24a7c..e2f1e2882f 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -8,14 +8,16 @@ import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompatEnabled;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
-import com.github.technus.tectech.loader.recipe.RecipeLoader;
+import com.github.technus.tectech.loader.recipe.BaseRecipeLoader;
 import com.github.technus.tectech.loader.thing.ComponentLoader;
 import com.github.technus.tectech.loader.thing.CoverLoader;
 import com.github.technus.tectech.loader.thing.MachineLoader;
 import com.github.technus.tectech.loader.thing.ThingsLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.Textures;
-import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_collider;
+import com.github.technus.tectech.thing.metaTileEntity.multi.em_collider.GT_MetaTileEntity_EM_collider;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ProgressManager;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -43,7 +45,7 @@ import static com.github.technus.tectech.TecTech.*;
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat;
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static gregtech.api.enums.GT_Values.W;
 
 public final class MainLoader {
@@ -65,17 +67,17 @@ public final class MainLoader {
 
         //set expanded texture arrays for tiers
         try {
-            new Textures();
+            Textures.run();
         }catch (Throwable t){
             LOGGER.error("Loading textures...",t);
         }
     }
 
-    public static void load() {
+    public static void load(EMDefinitionsRegistry registry) {
         ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 9);
 
         progressBarLoad.step("Elemental Things");
-        new ElementalLoader().run();
+        new ElementalLoader().run(registry);
         LOGGER.info("Elemental Init Done");
 
         progressBarLoad.step("Thaumcraft Compatibility");
@@ -120,7 +122,7 @@ public final class MainLoader {
         ProgressManager.pop(progressBarLoad);
     }
 
-    public static void postLoad() {
+    public static void postLoad(EMDefinitionsRegistry registry, EMTransformationRegistry transformationInfo) {
         ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 6);
 
         progressBarPostLoad.step("Dreamcraft Compatibility");
@@ -138,15 +140,11 @@ public final class MainLoader {
         }
 
         progressBarPostLoad.step("Thaumcraft Compatibility");
-        if (Loader.isModLoaded(Reference.THAUMCRAFT)) {
-            aspectDefinitionCompat = new AspectDefinitionCompatEnabled();
-            aspectDefinitionCompat.run();
-        } else {
-            aspectDefinitionCompat = new AspectDefinitionCompat();
-        }
+        aspectDefinitionCompat = Loader.isModLoaded(Reference.THAUMCRAFT) ? new AspectDefinitionCompatEnabled() : new AspectDefinitionCompat();
+        aspectDefinitionCompat.run(registry);
 
         progressBarPostLoad.step("Recipes");
-        new RecipeLoader().run();
+        new BaseRecipeLoader().run(transformationInfo);
         TecTech.LOGGER.info("Recipe Init Done");
 
         progressBarPostLoad.step("Register Extra Hazmat Suits");
diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
index d360162fb6..e5b9fea395 100644
--- a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
+++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
@@ -11,8 +11,6 @@ import net.minecraft.item.Item;
 import java.util.List;
 
 public class CreativeTabTecTech extends CreativeTabs {
-    public static CreativeTabTecTech creativeTabTecTech;
-
     public CreativeTabTecTech(String name) {
         super(name);
     }
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
new file mode 100644
index 0000000000..d91d0e5900
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
@@ -0,0 +1,125 @@
+package com.github.technus.tectech.loader.recipe;
+
+import com.github.technus.tectech.Reference;
+import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader;
+import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
+import com.github.technus.tectech.compatibility.spartakcore.SpartakCoreRecipeLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.thing.CustomItemList;
+import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
+import com.github.technus.tectech.thing.item.EuMeterGT;
+import com.github.technus.tectech.thing.item.FrontRotationTriggerItem;
+import cpw.mods.fml.common.Loader;
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import static gregtech.api.enums.GT_Values.RA;
+
+/**
+ * Created by danie_000 on 16.11.2016.
+ */
+public class BaseRecipeLoader {
+    public static Materials getOrDefault(String name,Materials def){
+        Materials mat=Materials.get(name);
+        return mat == Materials._NULL || mat == null ? def : mat;
+    }
+
+    public void run(EMTransformationRegistry transformationInfo) {
+        EMAtomDefinition.setTransformations(transformationInfo);
+        EMHadronDefinition.setTransformations(transformationInfo);
+        if (Loader.isModLoaded(Reference.GTPLUSPLUS)) {
+            new GtppAtomLoader().setTransformations(transformationInfo);
+        }
+
+        // ===================================================================================================
+        // Recipes init - common goes here rest goes into methods below
+        // ===================================================================================================
+
+        for(int i=0;i<=15;i++) {
+            RA.addAssemblerRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(i), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1)}, Materials.Aluminium.getMolten(864), new ItemStack(TT_Container_Casings.sHintCasingsTT, 1, i), 32, 120);
+        }
+
+        //Scrench
+        GT_ModHandler.addCraftingRecipe(new ItemStack(FrontRotationTriggerItem.INSTANCE,1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"fPR", " RP", "S h",
+                        'P', OrePrefixes.plate.get(Materials.Cobalt),
+                        'R', OrePrefixes.stick.get(Materials.Cobalt),
+                        'S', OrePrefixes.stick.get(Materials.Wood),});
+
+        //BLUEprint
+        GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
+
+        //GT EU reader
+        GT_ModHandler.addCraftingRecipe(new ItemStack(EuMeterGT.INSTANCE,1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"PGW", "SCW", "BRN",
+                        'P', OrePrefixes.plateDouble.get(Materials.Steel),
+                        'G', OrePrefixes.plate.get(Materials.Glass),
+                        'W', OrePrefixes.cableGt01.get(Materials.Copper),
+                        'S', OrePrefixes.stick.get(Materials.Brass),
+                        'C', ItemList.Casing_Coil_Cupronickel.get(1),
+                        'B', Dyes.dyeBlue,
+                        'R', Dyes.dyeRed,
+                        'N', Dyes.dyeBlack,});
+
+        //Owner detector
+        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_OwnerDetector.get(1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"PPP","GEG","PPP",
+                        'P', OrePrefixes.plate.get(Materials.IronMagnetic),
+                        'G', OrePrefixes.plate.get(Materials.Glass),
+                        'E', OrePrefixes.gem.get(Materials.EnderPearl)});
+
+        //Data reader
+        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_DataReader.get(1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"BdB","GES","PwP",
+                        'B', OrePrefixes.screw.get(Materials.Iridium),
+                        'P', OrePrefixes.plate.get(Materials.Iridium),
+                        'G', ItemList.Cover_Screen,
+                        'S', OrePrefixes.circuit.get(Materials.Elite),
+                        'E', ItemList.Hull_IV});
+
+        //Data Bank
+        RA.addAssemblylineRecipe(ItemList.Hatch_DataAccess_EV.get(1), 20000, new ItemStack[]{
+                CustomItemList.Machine_Multi_Switch.get(1),
+                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
+                ItemList.Tool_DataOrb.get(1),
+                ItemList.Cover_Screen.get(1),
+        }, new FluidStack[]{
+                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                Materials.Hydrogen.getGas(1000),
+        }, CustomItemList.Machine_Multi_DataBank.get(1), 12000, 14000);
+        //CustomItemList.Machine_Multi_DataBank
+
+        //Bucks
+        //RA.addAssemblerRecipe(CustomItemList.)
+
+        //recipe for ass line data hatches
+        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataIn_Hatch.get(1), CustomItemList.dataInAss_Hatch.get(1), 2048, 12000);
+        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataOut_Hatch.get(1), CustomItemList.dataOutAss_Hatch.get(1), 2048, 12000);
+
+        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
+            new DreamCraftRecipeLoader().run(transformationInfo);//init recipes for GTNH version
+        } else if (Loader.isModLoaded(Reference.SPARTAKCORE)) {
+        	new SpartakCoreRecipeLoader().run(transformationInfo);//init recipes for SpartakCore version
+        } else {
+            new BloodyRecipeLoader().run(transformationInfo);//init recipes for NON-GTNH version
+        }
+    }
+}
+
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
index 7b8cc14f4d..a57f268d4e 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.loader.recipe;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -22,9 +23,8 @@ import net.minecraftforge.fluids.FluidStack;
 /**
  * Created by Tec on 06.08.2017.
  */
-public class BloodyRecipeLoader implements Runnable {
-    @Override
-    public void run() {
+public class BloodyRecipeLoader {
+    public void run(EMTransformationRegistry transformationInfo) {
         //Quantum Glass
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 CustomItemList.eM_Containment.get(1),
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
deleted file mode 100644
index b5333c8e0d..0000000000
--- a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package com.github.technus.tectech.loader.recipe;
-
-import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader;
-import com.github.technus.tectech.compatibility.spartakcore.SpartakCoreRecipeLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
-import com.github.technus.tectech.thing.CustomItemList;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
-import com.github.technus.tectech.thing.item.EuMeterGT;
-import com.github.technus.tectech.thing.item.FrontRotationTriggerItem;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Dyes;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-
-import static gregtech.api.enums.GT_Values.RA;
-
-/**
- * Created by danie_000 on 16.11.2016.
- */
-public class RecipeLoader implements Runnable {
-    public static Materials getOrDefault(String name,Materials def){
-        Materials mat=Materials.get(name);
-        return mat == Materials._NULL || mat == null ? def : mat;
-    }
-
-    @Override
-    public void run() {
-        EMAtomDefinition.setTransformations();
-        EMHadronDefinition.setTransformations();
-
-        // ===================================================================================================
-        // Recipes init - common goes here rest goes into methods below
-        // ===================================================================================================
-
-        for(int i=0;i<=15;i++) {
-            RA.addAssemblerRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(i), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1)}, Materials.Aluminium.getMolten(864), new ItemStack(TT_Container_Casings.sHintCasingsTT, 1, i), 32, 120);
-        }
-
-        //Scrench
-        GT_ModHandler.addCraftingRecipe(new ItemStack(FrontRotationTriggerItem.INSTANCE,1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"fPR", " RP", "S h",
-                        'P', OrePrefixes.plate.get(Materials.Cobalt),
-                        'R', OrePrefixes.stick.get(Materials.Cobalt),
-                        'S', OrePrefixes.stick.get(Materials.Wood),});
-
-        //BLUEprint
-        GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
-
-        //GT EU reader
-        GT_ModHandler.addCraftingRecipe(new ItemStack(EuMeterGT.INSTANCE,1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"PGW", "SCW", "BRN",
-                        'P', OrePrefixes.plateDouble.get(Materials.Steel),
-                        'G', OrePrefixes.plate.get(Materials.Glass),
-                        'W', OrePrefixes.cableGt01.get(Materials.Copper),
-                        'S', OrePrefixes.stick.get(Materials.Brass),
-                        'C', ItemList.Casing_Coil_Cupronickel.get(1),
-                        'B', Dyes.dyeBlue,
-                        'R', Dyes.dyeRed,
-                        'N', Dyes.dyeBlack,});
-
-        //Owner detector
-        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_OwnerDetector.get(1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"PPP","GEG","PPP",
-                        'P', OrePrefixes.plate.get(Materials.IronMagnetic),
-                        'G', OrePrefixes.plate.get(Materials.Glass),
-                        'E', OrePrefixes.gem.get(Materials.EnderPearl)});
-
-        //Data reader
-        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_DataReader.get(1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"BdB","GES","PwP",
-                        'B', OrePrefixes.screw.get(Materials.Iridium),
-                        'P', OrePrefixes.plate.get(Materials.Iridium),
-                        'G', ItemList.Cover_Screen,
-                        'S', OrePrefixes.circuit.get(Materials.Elite),
-                        'E', ItemList.Hull_IV});
-
-        //Data Bank
-        RA.addAssemblylineRecipe(ItemList.Hatch_DataAccess_EV.get(1), 20000, new ItemStack[]{
-                CustomItemList.Machine_Multi_Switch.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
-                ItemList.Tool_DataOrb.get(1),
-                ItemList.Cover_Screen.get(1),
-        }, new FluidStack[]{
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Hydrogen.getGas(1000),
-        }, CustomItemList.Machine_Multi_DataBank.get(1), 12000, 14000);
-        //CustomItemList.Machine_Multi_DataBank
-
-        //Bucks
-        //RA.addAssemblerRecipe(CustomItemList.)
-
-        //recipe for ass line data hatches
-        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataIn_Hatch.get(1), CustomItemList.dataInAss_Hatch.get(1), 2048, 12000);
-        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataOut_Hatch.get(1), CustomItemList.dataOutAss_Hatch.get(1), 2048, 12000);
-
-        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
-            new DreamCraftRecipeLoader().run();//init recipes for GTNH version
-        } else if (Loader.isModLoaded(Reference.SPARTAKCORE)) {
-        	new SpartakCoreRecipeLoader().run();//init recipes for SpartakCore version
-        } else {
-            new BloodyRecipeLoader().run();//init recipes for NON-GTNH version
-        }
-    }
-}
-
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index b3df7483f5..4dd9d3422d 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -6,6 +6,7 @@ import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaQuantizer;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.*;
+import com.github.technus.tectech.thing.metaTileEntity.multi.em_collider.GT_MetaTileEntity_EM_collider;
 import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM;
@@ -15,7 +16,7 @@ import cpw.mods.fml.common.Loader;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.CustomItemList.*;
 
@@ -74,22 +75,22 @@ public class MachineLoader implements Runnable {
         // ===================================================================================================
 
         eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         
         // ===================================================================================================
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index c6ac34b66d..84f8a5e9d6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -31,18 +31,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
-    private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
+    private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;//can be const as it is computed later...
     private static final int COUNT_DIV=32;
     private static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
     private static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
     private static final int MEAN_DELAY =50;
-    private static final double CANCER_EFFECTIVENESS = 1/AVOGADRO_CONSTANT;
-    private static final double CHARGE_EFFECTIVENESS = 10/AVOGADRO_CONSTANT;
-    private static final double CHARGE_EXPLOSIVENESS = 5/AVOGADRO_CONSTANT;
+    private static final double CANCER_EFFECTIVENESS = 1/ EM_COUNT_PER_MATERIAL_AMOUNT;
+    private static final double CHARGE_EFFECTIVENESS = 10/ EM_COUNT_PER_MATERIAL_AMOUNT;
+    private static final double CHARGE_EXPLOSIVENESS = 5/ EM_COUNT_PER_MATERIAL_AMOUNT;
 
     private boolean fixMe=false;
     private final ArrayList<EntityPlayer> playersWithCharge = new ArrayList<>();
@@ -133,7 +133,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     }
 
     private void swapSomething(Chunk a,Chunk b,double mass) {
-        float explosionPower=(float) Math.log(mass/AVOGADRO_CONSTANT);
+        float explosionPower=(float) Math.log(mass/ EM_COUNT_PER_MATERIAL_AMOUNT);
         for (int i = 0; i < Math.min((int)explosionPower,64); i++) {
             int x = TecTech.RANDOM.nextInt(16);
             int y = TecTech.RANDOM.nextInt(a.worldObj.getActualHeight());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
index e00e72446d..d607dfad73 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
@@ -19,7 +19,4 @@ public final class EMException extends RuntimeException {
     public EMException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
-
-    public EMException() {
-    }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
index af4caf854b..18f2f76498 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -1,36 +1,31 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
 
 /**
  * Created by danie_000 on 30.12.2017.
  */
 public class EMGive implements ICommand {
-    ArrayList<String> aliases=new ArrayList<>();
+    ArrayList<String> aliases = new ArrayList<>();
 
-    public EMGive(){
+    public EMGive() {
         aliases.add("em_give");
         aliases.add("give_em");
         aliases.add("gib_em");
@@ -39,27 +34,24 @@ public class EMGive implements ICommand {
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
         if (sender instanceof EntityPlayerMP && !sender.getEntityWorld().isRemote) {
-            if(args.length < 3) {
+            if (args.length < 3) {
                 sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
-            }else{
-                TecTech.LOGGER.info("Spawninig EM for "+((EntityPlayerMP) sender).getDisplayName()+" - "+Arrays.toString(args));
+            } else {
+                TecTech.LOGGER.info("Spawninig EM for " + ((EntityPlayerMP) sender).getDisplayName() + " - " + Arrays.toString(args));
 
-                ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
-                String energy=list.remove(0);
+                ArrayList<String> list   = new ArrayList<>(Arrays.asList(args));
+                String            energy = list.remove(0);
 
-                EMDefinitionStack def = getDefinitionStack(list);
-                if(def!=null) {
-                    EMInstanceStack instanceStack = new EMInstanceStack(def, 1D, 0D, Long.parseLong(energy));
+                EMDefinitionStack def = getDefinitionStack(TecTech.definitionsRegistry, list);
+                if (def != null) {
+                    EMInstanceStack instanceStack = new EMInstanceStack(def, 1, 0, Long.parseLong(energy));
 
                     sender.addChatMessage(new ChatComponentText(instanceStack.getDefinition().getSymbol() + " - " + instanceStack.getDefinition().getLocalizedName()));
 
                     EMInstanceStackMap instanceMap = new EMInstanceStackMap(instanceStack);
 
                     ItemStack itemStack = new ItemStack(DebugElementalInstanceContainer_EM.INSTANCE);
-                    NBTTagCompound contents = new NBTTagCompound();
-                    contents.setTag("info", instanceMap.getInfoNBT());
-                    contents.setTag("content", instanceMap.toNBT());
-                    itemStack.setTagCompound(contents);
+                    DebugElementalInstanceContainer_EM.INSTANCE.setContent(itemStack, instanceMap);
 
                     ((EntityPlayerMP) sender).inventory.addItemStackToInventory(itemStack);
                 }
@@ -67,40 +59,45 @@ public class EMGive implements ICommand {
         }
     }
 
-    private EMDefinitionStack getDefinitionStack(ArrayList<String> args){
-        if(args.get(0).equals("<")){
-            args.remove(0);
+    private EMDefinitionStack getDefinitionStack(EMDefinitionsRegistry registry, ArrayList<String> args) {
+        double amount;
+        if (args.size() == 0) {
             return null;
         }
-        double amount=Double.parseDouble(args.remove(0));
-        try{
-            int id=Integer.parseInt(args.get(0));
-            args.remove(0);
-            IEMDefinition primitive = IEMDefinition.getBindsPrimitive().get(id);
-            return new EMDefinitionStack(primitive,amount);
-        }catch (NumberFormatException e){
-            byte clazz = (byte) args.remove(0).charAt(0);
-            Method constructor = IEMDefinition.getBindsComplex().get(clazz);
-
-            EMDefinitionStackMap stacks =new EMDefinitionStackMap();
-            while(args.size()>0){
-                EMDefinitionStack tempStack =getDefinitionStack(args);
-                if(tempStack==null) {
-                    break;
-                }else {
-                    stacks.putUnifyExact(tempStack);
-                }
+        String defTag = args.remove(0);
+        if ("<".equals(defTag)) {
+            return null;
+        }
+        try {
+            amount = Double.parseDouble(defTag);
+            if (args.size() == 0) {
+                return null;
             }
-
-            try {
-                return ((IEMDefinition) constructor.invoke(null, stacks.toNBT())).getStackForm(amount);
-            } catch (Exception e1) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
+            defTag = args.remove(0);
+            if ("<".equals(defTag)) {
+                return null;
+            }
+        } catch (Exception e) {
+            amount = 1;
+        }
+        IEMDefinition definition = registry.getDirectBinds().get(defTag);
+        if (definition != null) {
+            return definition.getStackForm(amount);
+        }
+        EMIndirectType emIndirectType = registry.getIndirectBinds().get(defTag);
+        if (emIndirectType != null) {
+            EMDefinitionStackMap stacks = new EMDefinitionStackMap();
+            while (args.size() > 0) {
+                EMDefinitionStack definitionStack = getDefinitionStack(registry, args);
+                if (definitionStack == null) {
+                    break;
+                } else {
+                    stacks.putUnifyExact(definitionStack);
                 }
-                return nbtE__.getStackForm(amount);
             }
+            return emIndirectType.create(registry, stacks.toNBT(registry)).getStackForm(amount);
         }
+        return null;
     }
 
     @Override
@@ -120,33 +117,20 @@ public class EMGive implements ICommand {
 
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==2){
-            return completionsForClassOrID();
+        if (args.length > 1 && args.length % 2 == 0) {
+            return new ArrayList<>(TecTech.definitionsRegistry.getBinds().keySet());
         }
         return null;
     }
 
-    private List<String> completionsForClassOrID(){
-        ArrayList<String> strings=new ArrayList<>(8);
-        Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
-        for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-            strings.add(String.valueOf((char)e.getKey().byteValue()));
-        }
-        Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
-        for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
-            strings.add(String.valueOf(e.getKey().byteValue()));
-        }
-        return strings;
-    }
-
     @Override
     public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_give Energy Count ClassOrId (Count ClassOrId ... <)";
+        return "em_give Energy Count ClassOrId ( (Count ClassOrId ... <) ...<)";
     }
 
     @Override
     public int compareTo(Object o) {
-        if(o instanceof ICommand){
+        if (o instanceof ICommand) {
             return getCommandName().compareTo(((ICommand) o).getCommandName());
         }
         return 0;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
index 13531dbf85..90eddf1e23 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -1,15 +1,15 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
+import com.github.technus.tectech.util.Util;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Created by danie_000 on 30.12.2017.
@@ -26,27 +26,32 @@ public class EMList implements ICommand {
     public void processCommand(ICommandSender sender, String[] args) {
         if (!sender.getEntityWorld().isRemote) {
             if(args.length == 0) {
-                sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
-                Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
-                for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                    sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
-                }
-            }else if(args.length==1){
-                sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
-                if(args[0].equals(String.valueOf((char) EMPrimitiveTemplate.nbtType))){
-                    Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
-                    for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
-                        sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getLocalizedName()));
-                    }
-                }else{
-                    sender.addChatMessage(new ChatComponentText("Complex definition - needs contents"));
-                }
-            }else{
-                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
+                listClasses(sender);
+            }else {
+                listDefinitions(sender, Util.getConcated(args," "));
             }
         }
     }
 
+    private void listDefinitions(ICommandSender sender, String arg) {
+        sender.addChatMessage(new ChatComponentText("    Available Direct: tag - name symbol"));
+        for (EMType directType : TecTech.definitionsRegistry.getDirectTypes().values()) {
+            if ("*".equals(arg) || arg.equalsIgnoreCase(directType.getLocalizedName())) {
+                directType.getDefinitions().forEach((bind, definition) ->
+                        sender.addChatMessage(new ChatComponentText(bind + " - " + definition.getLocalizedName() + " " + definition.getSymbol())));
+            }
+        }
+    }
+
+    private void listClasses(ICommandSender sender) {
+        sender.addChatMessage(new ChatComponentText("    Available Direct: name (use name as parameter to learn more"));
+        TecTech.definitionsRegistry.getDirectTypes().forEach((aClass, emDirectType) ->
+                sender.addChatMessage(new ChatComponentText(emDirectType.getLocalizedName())));
+        sender.addChatMessage(new ChatComponentText("    Available Indirect: tag - name"));
+        TecTech.definitionsRegistry.getIndirectBinds().forEach((bind, emIndirectType) ->
+                sender.addChatMessage(new ChatComponentText(bind+" - "+emIndirectType.getLocalizedName())));
+    }
+
     @Override
     public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
         return false;
@@ -65,19 +70,14 @@ public class EMList implements ICommand {
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
         if(args.length==0){
-            Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
-            ArrayList<String> strings=new ArrayList<>(binds.size());
-            for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
-            }
-            return strings;
+            return TecTech.definitionsRegistry.getDirectTypes().values().stream().map(EMType::getLocalizedName).collect(Collectors.toList());
         }
         return null;
     }
 
     @Override
     public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_list (optional class tag)";
+        return "em_list (optional Direct Name or *)";
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
index 94a50ce322..13838cf443 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -29,11 +30,6 @@ public abstract class EMComplexTemplate implements IEMDefinition {
         return getSubParticles().compareWithAmountsInternal(o.getSubParticles());
     }
 
-    @Override
-    public final EMDefinitionStack getStackForm(double amount) {
-        return new EMDefinitionStack(this, amount);
-    }
-
     @Override
     public final boolean equals(Object obj) {
         if(this==obj) {
@@ -50,24 +46,22 @@ public abstract class EMComplexTemplate implements IEMDefinition {
 
     @Override
     public int hashCode() {//Internal amounts should be also hashed
-        int hash = -(getSubParticles().size() << 4);
+        int hash = -(getSubParticles().size() << 16);
         for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
             int amount=(int) stack.getAmount();
-            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
+            hash += ((amount & 0x1) == 0 ? -amount : amount) * (stack.getDefinition().hashCode()<<4);
         }
         return hash;
     }
 
     @Override
     public String toString() {
-        return getLocalizedName()+ '\n' + getSymbol();
+        return getLocalizedName()+ " " + getSymbol();
     }
 
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbtTagCompound = getSubParticles().toNBT();
-        nbtTagCompound.setInteger(EMDefinitionsRegistry.getIndirectTagName(), getIndirectTagValue());
-        return nbtTagCompound;
+    public NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
+        return registry.indirectToNBT(getIndirectTagValue(),getSubParticles());
     }
 
-    protected abstract int getIndirectTagValue();
+    protected abstract String getIndirectTagValue();
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
deleted file mode 100644
index c0f9df32f2..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-import java.util.function.Function;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
-
-public class EMDefinitionsRegistry {
-    private static final NavigableSet<IEMDefinition>                                     STACKS_REGISTERED = new TreeSet<>();
-    private static final Map<Integer, IEMDefinition>                                     DIRECT_BINDS      = new HashMap<>();
-    private static final Map<Integer, Function<NBTTagCompound, ? extends IEMDefinition>> CLASS_BINDS       = new HashMap<>();//creator methods in subclasses
-    private static final Map<Integer, Class<? extends IEMDefinition>>                    CLASSES           = new HashMap<>();
-    private static final Map<Class<? extends IEMDefinition>, Integer>                    CLASS_TYPES       = new HashMap<>();
-    private static final String                                                          INDIRECT_TAG      = "t";
-    private static final String                                                          DIRECT_TAG        = "c";
-
-    private EMDefinitionsRegistry() {
-    }
-
-    static {
-        CLASS_BINDS.put(0, EMDefinitionsRegistry::getDefinitionDirect);
-        CLASS_BINDS.put((int) 'p', EMDefinitionsRegistry::getDefinitionDirect);
-    }
-
-    private static IEMDefinition getDefinitionDirect(NBTTagCompound nbt) {
-        return DIRECT_BINDS.get(nbt.getInteger(getDirectTagName()));
-    }
-
-    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
-        IEMDefinition apply;
-        try {
-            apply = CLASS_BINDS.get(nbt.getInteger(getIndirectTagName())).apply(nbt);
-        } catch (Exception e) {
-            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
-            if (DEBUG_MODE) {
-                emException.printStackTrace();
-                return nbtE__;
-            } else {
-                throw emException;
-            }
-        }
-        if (!DEBUG_MODE) {
-            if (apply == nbtE__) {
-                throw new EMException("Deserialized to NBT ERROR!");
-            } else if (apply == null__ || apply == null) {
-                throw new EMException("Deserialized to NULL POINTER!");
-            }
-        }
-        if (apply == null) {
-            return null__;
-        }
-        return apply;
-    }
-
-    public static <T extends IEMDefinition> void registerDefinitionClass(int shortcutNBT, Function<NBTTagCompound, T> creator, Class<T> clazz, int classID) {
-        if (CLASS_BINDS.put(shortcutNBT, creator) != null) {
-            EMException e = new EMException("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            } else {
-                throw e;
-            }
-        }
-        if (CLASSES.put(classID, clazz) != null) {
-            EMException e = new EMException("Duplicate Class ID! " + classID + " used for class comparison");
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            } else {
-                throw e;
-            }
-        }
-        CLASS_TYPES.put(clazz, classID);
-    }
-
-    public static void registerDirectDefinition(IEMDefinition definition, int id) {
-        IEMDefinition old = DIRECT_BINDS.put(id, definition);
-        if (old != null) {
-            EMException e = new EMException("Duplicate primitive EM ID: " + id +
-                    " for " + definition.getLocalizedName() +
-                    " and " + old.getLocalizedName());
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            } else {
-                throw e;
-            }
-        }
-    }
-
-    public static NavigableSet<IEMDefinition> getStacksRegisteredForDisplay() {
-        return STACKS_REGISTERED;
-    }
-
-    public static void registerForDisplay(IEMDefinition definition){
-        STACKS_REGISTERED.add(definition);
-        STACKS_REGISTERED.add(definition.getAnti());
-    }
-
-    public static String getIndirectTagName() {
-        return INDIRECT_TAG;
-    }
-
-    public static String getDirectTagName() {
-        return DIRECT_TAG;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index b529b79cc0..0f25d73704 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -2,10 +2,8 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.ArrayList;
@@ -25,41 +23,43 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     //int -electric charge in 1/3rds of electron charge for optimization
     private final int    charge;
     //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private final byte   color;
+    private final int color;
     //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
-    private final byte type;
+    private final int generation;
 
-    private EMPrimitiveTemplate anti;//IMMUTABLE
+    private IEMDefinition anti;//IMMUTABLE
     private EMDecay[]           elementalDecays;
     private byte                naturalDecayInstant;
     private byte energeticDecayInstant;
     private double rawLifeTime;
 
     private final int ID;
+    private final String bind;
 
     //no _ at end - normal particle
     //   _ at end - anti particle
     //  __ at end - self is antiparticle
 
-    protected EMPrimitiveTemplate(String name, String symbol, int type, double mass, int charge, int color, int ID) {
+    protected EMPrimitiveTemplate(String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) {
         this.name = name;
         this.symbol = symbol;
-        this.type = (byte) type;
+        this.generation = generation;
         this.mass = mass;
         this.charge = charge;
-        this.color = (byte) color;
+        this.color = color;
         this.ID = ID;
-        EMDefinitionsRegistry.registerDirectDefinition(this,ID);
+        this.bind=bind;
     }
 
     //
-    protected void init(EMPrimitiveTemplate antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
+    protected void init(EMDefinitionsRegistry registry,IEMDefinition antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
         anti = antiParticle;
         this.rawLifeTime = rawLifeTime;
         naturalDecayInstant = (byte) naturalInstant;
         energeticDecayInstant = (byte) energeticInstant;
         elementalDecays =elementalDecaysArray;
-        EMDefinitionsRegistry.registerForDisplay(this);
+        registry.registerForDisplay(this);
+        registry.registerDirectDefinition(bind,this);
     }
 
     @Override
@@ -83,7 +83,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return color;
     }
 
@@ -153,44 +153,27 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     }
 
     @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public byte getMatterType() {
-        return type;
+    public int getGeneration() {
+        return generation;
     }
 
     @Override
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger(EMDefinitionsRegistry.getDirectTagName(), ID);
-        return nbt;
+    public final NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
+        return registry.directToNBT(bind);
     }
 
     @Override
-    protected final int getIndirectTagValue() {
+    protected final String getIndirectTagValue() {
         throw new EMException("This class should only be used directly!");
     }
 
     @Override
-    public final byte getClassType() {
+    public final int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic(){
-        return -128;
+    public static int getClassTypeStatic(){
+        return Short.MIN_VALUE;
     }
 
     @Override
@@ -203,7 +186,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + EMDefinitionsRegistry.getDirectTagName() + ' ' + getClassType());
+            lines.add("DIRECT = " + bind + ' ' + getMatterMassType());
         }
         if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+ getLocalizedName());
@@ -213,7 +196,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
         if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+            lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
         if(areBitsSet(SCAN_GET_MASS,capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
@@ -226,7 +209,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
 
     @Override
     public final int compareTo(IEMDefinition o) {
-        if (getClassType() == o.getClassType()) {
+        if (getMatterMassType() == o.getMatterMassType()) {
             int oID = ((EMPrimitiveTemplate) o).ID;
             return Integer.compare(ID, oID);
         }
@@ -238,7 +221,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         return ID;
     }
 
-    public String getName() {
+    public String getUnlocalizedName() {
         return name;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
index 06bfc61737..8125812dc6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
@@ -1,11 +1,9 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.ArrayList;
@@ -31,9 +29,9 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
 
     void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
 
-    byte getMatterType();
+    int getMatterMassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
 
-    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
+    int getGeneration();
 
     //Not dynamically changing stuff
     IEMDefinition getAnti();//gives new anti particle def
@@ -59,7 +57,11 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
     int getCharge();//charge 1/3 electron charge
 
     //dynamically changing stuff
-    byte getColor();//-1 nope cannot 0 it can but undefined
+    int getMaxColors();
+
+    default boolean hasColor(){
+        return getMaxColors()>0;
+    }
 
     double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
 
@@ -67,19 +69,17 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
 
     EMConstantStackMap getSubParticles();//contents... null if none
 
-    EMFluidDequantizationInfo someAmountIntoFluidStack();
-
-    EMItemDequantizationInfo someAmountIntoItemsStack();
-
-    EMOredictDequantizationInfo someAmountIntoOredictStack();
+    NBTTagCompound toNBT(EMDefinitionsRegistry registry);
 
-    NBTTagCompound toNBT();
-
-    EMDefinitionStack getStackForm(double amount);
+    default EMDefinitionStack getStackForm(double amount){
+        return new EMDefinitionStack(this,amount);
+    }
 
-    IEMDefinition clone();
+    default IEMDefinition clone(){
+        return this;
+    }
 
     default int compareClassID(IEMDefinition obj) {
-        return (int) getClassType() - obj.getClassType();
+        return getMatterMassType() - obj.getMatterMassType();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java
new file mode 100644
index 0000000000..458965da66
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java
@@ -0,0 +1,189 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+
+public class EMDefinitionsRegistry {
+    private static final String TAG_NAME = "EM";
+
+    private final NavigableSet<IEMDefinition> stacksRegistered = new TreeSet<>();
+
+    private final Map<Integer, IEMDefinition> hashMap  = new HashMap<>();
+    private final Map<Integer, IEMDefinition> hashMapR = Collections.unmodifiableMap(hashMap);
+
+    private final Map<Class<? extends IEMDefinition>, EMType>         types          = new HashMap<>();
+    private final Map<Class<? extends IEMDefinition>, EMType>         typesR         = Collections.unmodifiableMap(types);
+    private final Map<Class<? extends IEMDefinition>, EMType>         directTypes    = new HashMap<>();
+    private final Map<Class<? extends IEMDefinition>, EMType>         directTypesR   = Collections.unmodifiableMap(directTypes);
+    private final Map<Class<? extends IEMDefinition>, EMIndirectType> indirectTypes  = new HashMap<>();
+    private final Map<Class<? extends IEMDefinition>, EMIndirectType> indirectTypesR = Collections.unmodifiableMap(indirectTypes);
+
+    private final Map<String, EMType>         binds          = new HashMap<>();
+    private final Map<String, EMType>         bindsR         = Collections.unmodifiableMap(binds);
+    private final Map<String, IEMDefinition>  directBinds    = new HashMap<>();
+    private final Map<String, IEMDefinition>  directBindsR   = Collections.unmodifiableMap(directBinds);
+    private final Map<String, EMIndirectType> indirectBinds  = new HashMap<>();
+    private final Map<String, EMIndirectType> indirectBindsR = Collections.unmodifiableMap(indirectBinds);
+
+    public NBTTagCompound directToNBT(String bind) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setString(TAG_NAME, bind);
+        return nbt;
+    }
+
+    public NBTTagCompound indirectToNBT(String bind, IEMMapRead<EMDefinitionStack> content) {
+        NBTTagCompound nbt = content.toNBT(this);
+        nbt.setString(TAG_NAME, bind);
+        return nbt;
+    }
+
+    public IEMDefinition fromNBT(NBTTagCompound nbt) {
+        IEMDefinition definition;
+        try {
+            String bind = nbt.getString(TAG_NAME);
+            definition = directBinds.get(bind);
+            if (definition == null) {
+                definition = indirectBinds.get(bind).create(this, nbt);
+            }
+        } catch (Exception e) {
+            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
+            if (DEBUG_MODE) {
+                emException.printStackTrace();
+                return nbtE__;
+            } else {
+                throw emException;
+            }
+        }
+        if (!DEBUG_MODE) {
+            if (definition == nbtE__) {
+                throw new EMException("Deserialized to NBT ERROR!");
+            } else if (definition == null) {
+                throw new EMException("Deserialized to NULL POINTER!");
+            } else if (definition == null__) {
+                throw new EMException("Deserialized to NULL!");
+            }
+        }
+        if (definition == null) {
+            return null__;
+        }
+        return definition;
+    }
+
+    public boolean isOccupied(String bind) {
+        return binds.containsKey(bind);
+    }
+
+    protected void addType(EMType emType) {
+        if (types.put(emType.getClazz(), emType) != null) {
+            EMException e = new EMException("Class collision! " + emType.getClazz().getName());
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    protected void bindType(String bind, EMType emType) {
+        if (binds.put(bind, emType) != null) {
+            EMException e = new EMException("NBT Bind collision! " + bind);
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    public void registerDefinitionClass(String bind, EMIndirectType emIndirectType) {
+        addType(emIndirectType);
+        indirectTypes.put(emIndirectType.getClazz(), emIndirectType);
+        bindType(bind, emIndirectType);
+        indirectBinds.put(bind, emIndirectType);
+    }
+
+    public void registerDefinitionClass(EMType emDirectType) {
+        addType(emDirectType);
+    }
+
+    public void registerDirectDefinition(String bind, IEMDefinition definition) {
+        if (hashMap.put(definition.hashCode(), definition) != null) {
+            EMException e = new EMException("Hash collision! " + definition.hashCode());
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+        EMType emType = directTypes.get(definition.getClass());
+        if (emType == null) {
+            emType = types.get(definition.getClass());
+            if (emType != null) {
+                directTypes.put(definition.getClass(), emType);
+            } else {
+                EMException e = new EMException("Direct Type bind missing! " + definition.getClass().getName());
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                } else {
+                    throw e;
+                }
+            }
+        }
+        if (emType != null) {
+            directTypes.put(definition.getClass(), emType);
+            bindType(bind, emType);
+            emType.addDefinition(bind, definition);
+            directBinds.put(bind, definition);
+        }
+    }
+
+    public void registerForDisplay(IEMDefinition definition) {
+        stacksRegistered.add(definition);
+        IEMDefinition anti = definition.getAnti();
+        if (anti != null) {
+            stacksRegistered.add(anti);
+        }
+    }
+
+    @Deprecated
+    public Map<Integer, IEMDefinition> getHashMapping() {
+        return hashMapR;
+    }
+
+    public NavigableSet<IEMDefinition> getStacksRegisteredForDisplay() {
+        return stacksRegistered;
+    }
+
+    public Map<String, EMType> getBinds() {
+        return bindsR;
+    }
+
+    public Map<String, IEMDefinition> getDirectBinds() {
+        return directBindsR;
+    }
+
+    public Map<String, EMIndirectType> getIndirectBinds() {
+        return indirectBindsR;
+    }
+
+    public Map<Class<? extends IEMDefinition>, EMType> getTypes() {
+        return typesR;
+    }
+
+    public Map<Class<? extends IEMDefinition>, EMType> getDirectTypes() {
+        return directTypesR;
+    }
+
+    public Map<Class<? extends IEMDefinition>, EMIndirectType> getIndirectTypes() {
+        return indirectTypesR;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java
new file mode 100644
index 0000000000..680dd029a4
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java
@@ -0,0 +1,37 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.function.BiFunction;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+public class EMIndirectType extends EMType {
+    private final BiFunction<EMDefinitionsRegistry, NBTTagCompound, IEMDefinition> creator;
+
+    public EMIndirectType(BiFunction<EMDefinitionsRegistry, NBTTagCompound, IEMDefinition> creator, Class<? extends IEMDefinition> clazz, String unlocalizedName) {
+        super(clazz, unlocalizedName);
+        this.creator = creator;
+    }
+
+    protected BiFunction<EMDefinitionsRegistry,NBTTagCompound, IEMDefinition> getCreator() {
+        return creator;
+    }
+
+    public IEMDefinition create(EMDefinitionsRegistry registry,NBTTagCompound nbt){
+        try {
+            return creator.apply(registry, nbt);
+        }catch (Exception e){
+            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
+            if (DEBUG_MODE) {
+                emException.printStackTrace();
+                return nbtE__;
+            } else {
+                throw emException;
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java
new file mode 100644
index 0000000000..73097db663
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java
@@ -0,0 +1,63 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+public class EMType {
+    private final Map<String, IEMDefinition> definitions  = new HashMap<>();
+    private final Map<String, IEMDefinition> definitionsR = Collections.unmodifiableMap(definitions);
+    private final Class<? extends IEMDefinition>                   clazz;
+    private final String                     unlocalizedName;
+
+    public EMType(Class<? extends IEMDefinition> clazz, String unlocalizedName) {
+        this.clazz = clazz;
+        this.unlocalizedName = unlocalizedName;
+    }
+
+    public Class<? extends IEMDefinition> getClazz() {
+        return clazz;
+    }
+
+    public String getUnlocalizedName() {
+        return unlocalizedName;
+    }
+
+    public String getLocalizedName() {
+        return translateToLocal(getUnlocalizedName());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        return clazz==((EMType) o).clazz;
+    }
+
+    @Override
+    public int hashCode() {
+        return clazz.hashCode();
+    }
+
+    public void addDefinition(String bind, IEMDefinition definition) {
+        if (definitions.put(bind, definition) != null) {
+            EMException e = new EMException("NBT Bind collision on Direct bind!");
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    public Map<String, IEMDefinition> getDefinitions() {
+        return definitionsR;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
index e6cfa7d03e..f6bef9910e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
@@ -45,10 +46,10 @@ public final class EMConstantStackMap/*IMMUTABLE*/ extends EMStackMap<EMDefiniti
         return new EMDefinitionStackMap(new TreeMap<>(getBackingMap()));
     }
 
-    public static EMConstantStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+    public static EMConstantStackMap fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) throws EMException {
         EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
         for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            defStacks[i] = EMDefinitionStack.fromNBT(registry,nbt.getCompoundTag(Integer.toString(i)));
             if (defStacks[i].getDefinition().equals(nbtE__)) {
                 throw new EMException("Something went Wrong");
             }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
index 78bb8d740a..57b8f7bf1c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
@@ -43,10 +44,10 @@ public final class EMDefinitionStackMap extends EMStackMap<EMDefinitionStack> im
         return new EMConstantStackMap(getBackingMap());
     }
 
-    public static EMDefinitionStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+    public static EMDefinitionStackMap fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) throws EMException {
         EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
         for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            defStacks[i] = EMDefinitionStack.fromNBT(registry,nbt.getCompoundTag(Integer.toString(i)));
             if (defStacks[i].getDefinition().equals(nbtE__)) {
                 throw new EMException("Something went Wrong");
             }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
index 69dc53f83d..64ff7063e8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -1,10 +1,12 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
@@ -13,9 +15,10 @@ import java.util.Map;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
 import static com.github.technus.tectech.util.DoubleCount.add;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.01.2017.
@@ -91,7 +94,7 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         for (EMInstanceStack instance : getBackingMap().values()) {
             info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName()+
                     " "+ EnumChatFormatting.AQUA + instance.getDefinition().getSymbol()+ EnumChatFormatting.RESET+
-                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E", instance.getAmount() / AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
+                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E", instance.getAmount() /AVOGADRO_CONSTANT) +" "+translateToLocal("tt.keyword.mol")+ EnumChatFormatting.RESET+
                     " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
                     " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
         }
@@ -120,16 +123,15 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
     }
 
     public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
-        cleanUp();
+        //cleanUp();
         double diff=0;
-        for (EMInstanceStack instance : valuesToArray()) {
+        for (EMInstanceStack instance : takeAllToArray()) {
             instance.setAge(instance.getAge() + seconds);
             EMDecayResult newInstances = instance.decay(lifeTimeMult, instance.getAge(), postEnergize);
             if (newInstances == null) {
-                instance.nextColor();
+                putUnify(instance);
             } else {
                 diff=add(diff,newInstances.getMassDiff());
-                removeAmount(instance);//todo check maybe this should be removeKey
                 putUnifyAll(newInstances.getOutput());
             }
         }
@@ -157,10 +159,10 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return nbt;
     }
 
-    public static EMInstanceStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+    public static EMInstanceStackMap fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) throws EMException {
         EMInstanceStack[] instances = new EMInstanceStack[nbt.getInteger("i")];
         for (int i = 0; i < instances.length; i++) {
-            instances[i] = EMInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            instances[i] = EMInstanceStack.fromNBT(registry,nbt.getCompoundTag(Integer.toString(i)));
             if (instances[i].getDefinition().equals(nbtE__)) {
                 throw new EMException("Something went Wrong");
             }
@@ -188,6 +190,12 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return build.toString();
     }
 
+    public EMInstanceStack[] takeAllToArray(){
+        EMInstanceStack[] newStack = valuesToArray();//just in case to uncouple The map
+        this.getBackingMap().clear();
+        return newStack;
+    }
+
     public EMInstanceStackMap takeAll(){
         EMInstanceStackMap newStack =new EMInstanceStackMap(false,new TreeMap<>(this.getBackingMap()));//just in case to uncouple The map
         this.getBackingMap().clear();
@@ -212,7 +220,7 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
             return stack;
         }
         double newAmount = add(target.getAmount(), stack.getAmount());
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=target.unifyIntoThis(stack);
             putReplace(stack);
             return stack;
@@ -230,7 +238,7 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
             return stack;
         }
         double newAmount = target.getAmount()+stack.getAmount();
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=target.unifyIntoThis(stack);
             putReplace(stack);
             return stack;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
index 1322566914..c0420fa2b2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
@@ -9,18 +10,11 @@ import net.minecraft.util.EnumChatFormatting;
 import java.lang.reflect.Array;
 import java.util.*;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.*;
 import static com.github.technus.tectech.util.DoubleCount.ulpSigned;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>>, Cloneable {
-    static boolean isValidAmount(double amount){
-        return amount>=AVOGADRO_CONSTANT_UNCERTAINTY;
-    }
-
-    static boolean isInvalidAmount(double amount){
-        return amount<AVOGADRO_CONSTANT_UNCERTAINTY;
-    }
-
     NavigableMap<IEMDefinition,T> getBackingMap();
 
     IEMMapRead<T> clone();
@@ -105,7 +99,7 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         for (T defStack : values()) {
             info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getLocalizedName();
             info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
-            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
+            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT+" "+translateToLocal("tt.keyword.mol");
             i += 3;
         }
         return info;
@@ -132,12 +126,12 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         return nbt;
     }
 
-    default NBTTagCompound toNBT() {
+    default NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setInteger("i", size());
         int i = 0;
         for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
-            nbt.setTag(Integer.toString(i++), entry.getValue().toNBT());
+            nbt.setTag(Integer.toString(i++), entry.getValue().toNBT(registry));
         }
         return nbt;
     }
@@ -265,7 +259,7 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
     }
 
     default boolean containsAmount(IEMDefinition def, double amountToConsume) {
-        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        double amountRequired=amountToConsume- EM_COUNT_EPSILON;
         if(amountRequired==amountToConsume){
             amountRequired-=ulpSigned(amountRequired);
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
index f13e82fb26..15815f2ee0 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
@@ -2,11 +2,11 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 
 import java.util.Map;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_EPSILON;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_EPSILON;
 import static com.github.technus.tectech.util.DoubleCount.*;
 
 public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
@@ -15,11 +15,11 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
     /**
      * Consumes amount from map
      * @param def def to consume
-     * @param amountToConsume should be comparable to {@link EMTransformationInfo#AVOGADRO_CONSTANT}
+     * @param amountToConsume should be comparable to {@link EMTransformationRegistry#EM_COUNT_PER_MATERIAL_AMOUNT}
      * @return consumed successfully
      */
     default boolean removeAmount(IEMDefinition def, double amountToConsume){
-        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        double amountRequired=amountToConsume- EM_COUNT_EPSILON;
         if(amountRequired==amountToConsume){
             amountRequired-=ulpSigned(amountRequired);
         }
@@ -31,7 +31,7 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
         if(current!=null){
             if(current.getAmount()>=amountRequired){
                 double newAmount=sub(current.getAmount(),amountToConsume);
-                if(IEMMapRead.isValidAmount(current.getAmount())){
+                if(IEMStack.isValidAmount(newAmount)){
                     current=(T)current.mutateAmount(newAmount);
                     getBackingMap().put(current.getDefinition(),current);
                 }else {
@@ -88,7 +88,7 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
             return stack;
         }
         double newAmount = add(target.getAmount(), stack.getAmount());
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=(T) target.mutateAmount(newAmount);
             putReplace(stack);
             return stack;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
index 167ec8451d..9da971944c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
@@ -7,7 +7,7 @@ import java.util.Map;
 
 public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
     default void cleanUp(){
-        entrySet().removeIf(entry -> IEMMapRead.isInvalidAmount(entry.getValue().getAmount()));
+        entrySet().removeIf(entry -> entry.getValue().isInvalidAmount());
     }
 
     default void clear() {
@@ -95,7 +95,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
         if(current!=null){
             double newAmount=current.getAmount()-amountToConsume;
             if(newAmount>=0){
-                if(IEMMapRead.isValidAmount(current.getAmount())){
+                if(current.isValidAmount()){
                     current=(T)current.mutateAmount(newAmount);
                     getBackingMap().put(current.getDefinition(),current);
                 } else {
@@ -142,7 +142,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
             return stack;
         }
         double newAmount = target.getAmount()+stack.getAmount();
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=(T) target.mutateAmount(newAmount);
             putReplace(stack);
             return stack;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
index f868dbe0ad..c1e6a729f8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -41,16 +41,16 @@ public final class EMDefinitionStack implements IEMStack {
         return amount;
     }
 
-    public NBTTagCompound toNBT() {
+    public NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
         NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setTag("d", getDefinition().toNBT(registry));
         nbt.setDouble("Q", getAmount());
         return nbt;
     }
 
-    public static EMDefinitionStack fromNBT(NBTTagCompound nbt) {
+    public static EMDefinitionStack fromNBT(EMDefinitionsRegistry registry,NBTTagCompound nbt) {
         return new EMDefinitionStack(
-                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
+                registry.fromNBT(nbt.getCompoundTag("d")),
                 nbt.getLong("q")+nbt.getDouble("Q"));
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
index 6347cd2144..b67d2ce121 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.util.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
@@ -14,19 +14,22 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.DoubleCount.*;
-import static java.lang.Math.*;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
 public final class EMInstanceStack implements IEMStack {
     public static int MIN_MULTIPLE_DECAY_CALLS = 4, MAX_MULTIPLE_DECAY_CALLS = 16;
-    public static double DECAY_CALL_PER = AVOGADRO_CONSTANT;//todo
+    public static double DECAY_CALL_PER = EM_COUNT_PER_MATERIAL_AMOUNT;//todo
 
     private final IEMDefinition definition;
     private       double        amount;
@@ -35,7 +38,7 @@ public final class EMInstanceStack implements IEMStack {
     //energy - if positive then particle should try to decay
     private long   energy;
     //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private byte   color;
+    private int   color;
     private double lifeTime;
     private double lifeTimeMult;
 
@@ -53,11 +56,10 @@ public final class EMInstanceStack implements IEMStack {
 
     public EMInstanceStack(IEMDefinition defSafe, double amount, double lifeTimeMult, double age, long energy) {
         definition = defSafe == null ? null__ : defSafe;
-        byte bColor = getDefinition().getColor();
-        if (bColor < 0 || bColor > 2) {//transforms colorable??? into proper color
-            this.color = bColor;
-        } else {
-            this.color = (byte) TecTech.RANDOM.nextInt(3);
+        if (getDefinition().hasColor()) {
+            this.color = (byte) TecTech.RANDOM.nextInt(getDefinition().getMaxColors());
+        } else {//transforms colorable??? into proper color
+            this.color = getDefinition().getMaxColors();
         }
         this.lifeTimeMult = lifeTimeMult;
         lifeTime = getDefinition().getRawTimeSpan(energy) * this.lifeTimeMult;
@@ -119,11 +121,11 @@ public final class EMInstanceStack implements IEMStack {
         return definition;
     }
 
-    public byte getColor() {
+    public int getColor() {
         return color;
     }
 
-    public void setColor(byte color) {//does not allow changing magic element
+    public void setColor(int color) {//does not allow changing magic element
         if (this.color < 0 || this.color > 2 || color < 0 || color >= 3) {
             return;
         }
@@ -131,10 +133,9 @@ public final class EMInstanceStack implements IEMStack {
     }
 
     public void nextColor() {//does not allow changing magic element
-        if (color < 0 || color > 2) {
-            return;
+        if (definition.hasColor()) {
+            color = (byte) TecTech.RANDOM.nextInt(definition.getMaxColors());
         }
-        color = (byte) TecTech.RANDOM.nextInt(3);
     }
 
     public double getLifeTime() {
@@ -524,7 +525,7 @@ public final class EMInstanceStack implements IEMStack {
             lines.add("ENERGY = " + energy);
         }
         if (Util.areBitsSet(SCAN_GET_AMOUNT, capabilities)) {
-            lines.add("AMOUNT = " + getAmount() / AVOGADRO_CONSTANT + " mol");
+            lines.add("AMOUNT = " + getAmount() /AVOGADRO_CONSTANT + " "+translateToLocal("tt.keyword.mol"));
         }
         scanContents(lines, getDefinition().getSubParticles(), 1, detailsOnDepthLevels);
     }
@@ -546,25 +547,25 @@ public final class EMInstanceStack implements IEMStack {
         }
     }
 
-    public NBTTagCompound toNBT() {
+    public NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
         NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setTag("d", getDefinition().toNBT(registry));
         nbt.setDouble("Q", getAmount());
-        nbt.setLong("e", energy);
-        nbt.setByte("c", color);
-        nbt.setDouble("A", getAge());
         nbt.setDouble("M", lifeTimeMult);
+        nbt.setDouble("A", getAge());
+        nbt.setLong("e", energy);
+        nbt.setInteger("c", color);
         return nbt;
     }
 
-    public static EMInstanceStack fromNBT(NBTTagCompound nbt) {
+    public static EMInstanceStack fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) {
         EMInstanceStack instance = new EMInstanceStack(
-                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
-                nbt.getLong("q") + nbt.getDouble("Q"),
-                nbt.getFloat("m") + nbt.getDouble("M"),
-                nbt.getLong("a") + nbt.getDouble("A"),
+                registry.fromNBT(nbt.getCompoundTag("d")),
+                nbt.getDouble("Q"),
+                nbt.getDouble("M"),
+                nbt.getDouble("A"),
                 nbt.getLong("e"));
-        instance.setColor(nbt.getByte("c"));
+        instance.setColor(nbt.getInteger("c"));
         return instance;
     }
 
@@ -587,7 +588,7 @@ public final class EMInstanceStack implements IEMStack {
 
     @Override
     public String toString() {
-        return getDefinition().toString() + '\n' + getAmount() / AVOGADRO_CONSTANT + " mol\n" + getMass();
+        return getDefinition().toString() + ' ' + getAmount() /AVOGADRO_CONSTANT + " "+translateToLocal("tt.keyword.mol")+" " + getMass()+" eV/c^2";
     }
 
     public void setAmount(double amount) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
index 5672b31c04..e5cfab9752 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
@@ -1,37 +1,56 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import net.minecraft.nbt.NBTTagCompound;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_MINIMUM;
+
 /**
  * Created by danie_000 on 30.01.2017.
  */
-public interface IEMStack extends Comparable<IEMStack>,Cloneable {
+public interface IEMStack extends Comparable<IEMStack>, Cloneable {
+    static boolean isValidAmount(double amount) {
+        return amount >= EM_COUNT_MINIMUM;
+    }
+
+    static boolean isInvalidAmount(double amount) {
+        return amount < EM_COUNT_MINIMUM;
+    }
+    default boolean isValidAmount() {
+        return isValidAmount(getAmount());
+    }
+
+    default boolean isInvalidAmount() {
+        return isInvalidAmount(getAmount());
+    }
+
     IEMDefinition getDefinition();
 
     double getAmount();
 
-    default double getCharge(){
-        return getDefinition().getCharge()*getAmount();
+    default double getCharge() {
+        return getDefinition().getCharge() * getAmount();
     }
 
-    default double getMass(){
-        return getDefinition().getMass()*getAmount();
+    default double getMass() {
+        return getDefinition().getMass() * getAmount();
     }
 
     IEMStack clone();
 
     /**
      * Will return stack with mutated amount, it might be a new object!
+     *
      * @param newAmount new amount
      * @return new stack (or previous one if was mutable)
      */
     IEMStack mutateAmount(double newAmount);
 
-    NBTTagCompound toNBT();
+    NBTTagCompound toNBT(EMDefinitionsRegistry registry);
 
     @Override
-    default int compareTo(IEMStack o){
+    default int compareTo(IEMStack o) {
         return getDefinition().compareTo(o.getDefinition());
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java
new file mode 100644
index 0000000000..855be96797
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java
@@ -0,0 +1,56 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public class EMDequantizationInfo {
+    private final IEMStack definition;
+    private       Object   stack;
+
+    public EMDequantizationInfo(IEMStack definition) {
+        this.definition = definition;
+    }
+
+    public IEMStack getInput() {
+        return definition;
+    }
+
+    public FluidStack getFluid() {
+        return ((FluidStack) stack).copy();
+    }
+
+    public void setFluid(FluidStack fluid) {
+        this.stack = fluid;
+    }
+
+    public ItemStack getItem() {
+        return ((ItemStack) stack).copy();
+    }
+
+    public void setItem(ItemStack item) {
+        this.stack = item;
+    }
+
+    public OreDictionaryStack getOre() {
+        return (OreDictionaryStack) stack;
+    }
+
+    public void setOre(OreDictionaryStack ore) {
+        this.stack = ore;
+    }
+
+    public Object getStack() {
+        return stack;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o instanceof EMDequantizationInfo && definition.equals(((EMDequantizationInfo) o).definition);
+    }
+
+    @Override
+    public int hashCode() {
+        return definition.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
deleted file mode 100644
index d74c36170e..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class EMFluidDequantizationInfo implements IEMExchangeInfo<IEMStack,FluidStack> {
-    private final IEMStack   in;
-    private final FluidStack out;
-
-    public EMFluidDequantizationInfo(IEMStack emIn, FluidStack fluidStackOut){
-        in=emIn;
-        out=fluidStackOut;
-    }
-
-    public EMFluidDequantizationInfo(IEMStack emIn, Fluid fluid, int fluidAmount){
-        in=emIn;
-        out=new FluidStack(fluid,fluidAmount);
-    }
-
-    @Override
-    public IEMStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public FluidStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof EMFluidDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
index 43fb5550aa..cf0cc6218c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
@@ -7,7 +7,7 @@ import net.minecraftforge.fluids.FluidStack;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class EMFluidQuantizationInfo implements IEMExchangeInfo<FluidStack, IEMStack> {
+public class EMFluidQuantizationInfo {
     private final FluidStack in;
     private final IEMStack   out;
 
@@ -21,12 +21,10 @@ public class EMFluidQuantizationInfo implements IEMExchangeInfo<FluidStack, IEMS
         out=emOut;
     }
 
-    @Override
     public FluidStack input() {
         return in.copy();
     }
 
-    @Override
     public IEMStack output() {
         return out.clone();
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
deleted file mode 100644
index af741c703d..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class EMItemDequantizationInfo implements IEMExchangeInfo<IEMStack,ItemStack> {
-    private final IEMStack  in;
-    private final ItemStack out;
-
-    public EMItemDequantizationInfo(IEMStack emIn, ItemStack itemStackOut){
-        in=emIn;
-        out=itemStackOut;
-    }
-
-    public EMItemDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int amount) {
-        in = emIn;
-        out = GT_OreDictUnificator.get(prefix, material, amount);
-    }
-
-    @Override
-    public IEMStack input() {
-        return in.clone();
-    }
-
-    @Override
-    public ItemStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof EMItemDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
index 553e806d38..c5db63b3ad 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
@@ -11,7 +11,7 @@ import net.minecraftforge.oredict.OreDictionary;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class EMItemQuantizationInfo implements IEMExchangeInfo<ItemStack, IEMStack> {
+public class EMItemQuantizationInfo {
     private final ItemStack in;
     private final boolean   skipNBT;
     private final IEMStack  out;
@@ -28,12 +28,10 @@ public class EMItemQuantizationInfo implements IEMExchangeInfo<ItemStack, IEMSta
         this.skipNBT = skipNBT;
     }
 
-    @Override
     public ItemStack input() {
         return in.copy();
     }
 
-    @Override
     public IEMStack output() {
         return out.clone();
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
deleted file mode 100644
index c8e337c7fd..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class EMOredictDequantizationInfo implements IEMExchangeInfo<IEMStack,String> {
-    private final IEMStack in;
-    private final String   out;
-    private final int      amount;
-
-    public EMOredictDequantizationInfo(IEMStack emIn, String name, int qty) {
-        in = emIn;
-        out =name;
-        amount = qty;
-    }
-
-    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int qty) {
-        in = emIn;
-        out = prefix.name() + material.mName;
-        amount = qty;
-    }
-
-    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, String materialName, int qty) {
-        in = emIn;
-        out = prefix.name() + materialName;
-        amount = qty;
-    }
-
-    @Override
-    public IEMStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public String output() {
-        return getOut();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof EMOredictDequantizationInfo && hashCode() == obj.hashCode();
-    }
-
-    public String getOut() {
-        return out;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
index 0ca0415b0d..3c54dd86ac 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
@@ -3,46 +3,41 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformation
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import net.minecraftforge.oredict.OreDictionary;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class EMOredictQuantizationInfo implements IEMExchangeInfo<String, IEMStack> {
-    private final String   in;
+public class EMOredictQuantizationInfo {
+    private final int      id;
     private final int      amount;
     private final IEMStack out;
 
-    public EMOredictQuantizationInfo(String name, int qty, IEMStack emOut){
-        in=name;
-        amount=qty;
-        out=emOut;
+    public EMOredictQuantizationInfo(int id, int amount, IEMStack out) {
+        this.id = id;
+        this.amount = amount;
+        this.out = out;
     }
 
-    public EMOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, IEMStack emOut){
-        in=prefix.name() + material.mName;
-        amount=qty;
-        out=emOut;
+    public EMOredictQuantizationInfo(String name, int qty, IEMStack emOut) {
+        this(OreDictionary.getOreID(name),qty,emOut);
     }
 
-    public EMOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, IEMStack emOut){
-        in=prefix.name() + materialName;
-        amount=qty;
-        out=emOut;
+    public EMOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, IEMStack emOut) {
+        this(prefix, material.mName, qty,emOut);
     }
 
-    @Override
-    public String input() {
-        return getIn();
+    public EMOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, IEMStack emOut) {
+        this(OreDictionary.getOreID(prefix.name() + materialName),qty,emOut);
     }
 
-    @Override
-    public IEMStack output() {
-        return out.clone();
+    public IEMStack getOut() {
+        return out;
     }
 
     @Override
     public int hashCode() {
-        return getIn().hashCode();
+        return getId();
     }
 
     @Override
@@ -50,8 +45,8 @@ public class EMOredictQuantizationInfo implements IEMExchangeInfo<String, IEMSta
         return obj instanceof EMOredictQuantizationInfo && hashCode() == obj.hashCode();
     }
 
-    public String getIn() {
-        return in;
+    public int getId() {
+        return id;
     }
 
     public int getAmount() {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
deleted file mode 100644
index d6f6731aec..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static java.lang.Math.pow;
-
-/**
- * Created by Tec on 26.05.2017.
- */
-public class EMTransformationInfo {
-    /**
-     * Atom count per Mol
-     */
-    public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    /**
-     * Min. chance of existing
-     */
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
-    /**
-     * Quantity considered to be indifferent when computing stuff
-     */
-    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
-    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
-    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
-    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON;
-
-    public static EMTransformationInfo TRANSFORMATION_INFO = new EMTransformationInfo();
-
-    private Map<Integer, EMFluidQuantizationInfo>               fluidQuantization;
-    private Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization;
-    private Map<Integer, EMOredictQuantizationInfo>             oredictQuantization;
-
-    private Map<IEMDefinition, EMFluidDequantizationInfo>   fluidDequantization;
-    private Map<IEMDefinition, EMItemDequantizationInfo>    itemDequantization;
-    private Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization;
-
-    private EMTransformationInfo() {
-        this(
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
-        );
-    }
-
-    public EMTransformationInfo(
-            Map<Integer, EMFluidQuantizationInfo> fluidQuantization,
-            Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization,
-            Map<Integer, EMOredictQuantizationInfo> oredictQuantization,
-            Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization,
-            Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization,
-            Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
-        this.setFluidQuantization(fluidQuantization);
-        this.setItemQuantization(itemQuantization);
-        this.setOredictQuantization(oredictQuantization);
-        this.setFluidDequantization(fluidDequantization);
-        this.setItemDequantization(itemDequantization);
-        this.setOredictDequantization(oredictDequantization);
-    }
-
-    public void addFluid(IEMStack em, FluidStack fluidStack){
-        getFluidQuantization().put(fluidStack.getFluidID(),new EMFluidQuantizationInfo(fluidStack,em));
-        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluidStack));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addFluid(IEMStack em, Fluid fluid, int fluidAmount){
-        getFluidQuantization().put(fluid.getID(),new EMFluidQuantizationInfo(fluid,fluidAmount,em));
-        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluid,fluidAmount));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    private void addItemQuantization(EMItemQuantizationInfo aIQI){
-        getItemQuantization().put(aIQI,aIQI);
-    }
-
-    public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT){
-        addItemQuantization(new EMItemQuantizationInfo(itemStack,skipNBT,em));
-        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,itemStack));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
-        addItemQuantization(new EMItemQuantizationInfo(prefix,material,amount,skipNBT,em));
-        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,prefix,material,amount));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addOredict(IEMStack em, String name, int qty){
-        getOredictQuantization().put(OreDictionary.getOreID(name),new EMOredictQuantizationInfo(name,qty,em));
-        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,name,qty));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty){
-        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + material.mName),new EMOredictQuantizationInfo(prefix,material,qty,em));
-        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,material,qty));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty){
-        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + materialName),new EMOredictQuantizationInfo(prefix,materialName,qty,em));
-        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,materialName,qty));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
-        return fluidQuantization;
-    }
-
-    public void setFluidQuantization(Map<Integer, EMFluidQuantizationInfo> fluidQuantization) {
-        this.fluidQuantization = fluidQuantization;
-    }
-
-    public Map<EMItemQuantizationInfo, EMItemQuantizationInfo> getItemQuantization() {
-        return itemQuantization;
-    }
-
-    public void setItemQuantization(Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization) {
-        this.itemQuantization = itemQuantization;
-    }
-
-    public Map<Integer, EMOredictQuantizationInfo> getOredictQuantization() {
-        return oredictQuantization;
-    }
-
-    public void setOredictQuantization(Map<Integer, EMOredictQuantizationInfo> oredictQuantization) {
-        this.oredictQuantization = oredictQuantization;
-    }
-
-    public Map<IEMDefinition, EMFluidDequantizationInfo> getFluidDequantization() {
-        return fluidDequantization;
-    }
-
-    public void setFluidDequantization(Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization) {
-        this.fluidDequantization = fluidDequantization;
-    }
-
-    public Map<IEMDefinition, EMItemDequantizationInfo> getItemDequantization() {
-        return itemDequantization;
-    }
-
-    public void setItemDequantization(Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization) {
-        this.itemDequantization = itemDequantization;
-    }
-
-    public Map<IEMDefinition, EMOredictDequantizationInfo> getOredictDequantization() {
-        return oredictDequantization;
-    }
-
-    public void setOredictDequantization(Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
-        this.oredictDequantization = oredictDequantization;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java
new file mode 100644
index 0000000000..5e41beb9fd
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java
@@ -0,0 +1,134 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+import static java.lang.Math.pow;
+
+/**
+ * Created by Tec on 26.05.2017.
+ */
+public class EMTransformationRegistry {
+    /**
+     * Atom count per Mol
+     */
+    public static final double AVOGADRO_CONSTANT            = 6.02214076e23D;
+    /**
+     * Scale to 1m^3 of C-12
+     */
+    public static final double EM_COUNT_PER_CUBE            = AVOGADRO_CONSTANT * 1650_000D / 0.012;
+    public static final double EM_COUNT_PER_MATERIAL_AMOUNT = EM_COUNT_PER_CUBE / 144 / 9;
+    public static final double EM_COUNT_PER_ITEM            = EM_COUNT_PER_CUBE * 9;
+    public static final double EM_COUNT_PER_1k              = EM_COUNT_PER_MATERIAL_AMOUNT * 1000;
+
+    public static final double EM_COUNT_MINIMUM = 1 / EM_COUNT_PER_CUBE;
+    /**
+     * Quantity considered to be indifferent when computing stuff
+     */
+    public static final double EM_COUNT_EPSILON = EM_COUNT_PER_CUBE / pow(2, 40);
+
+    public static final double EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED = EM_COUNT_PER_MATERIAL_AMOUNT - EM_COUNT_EPSILON;
+    public static final double EM_COUNT_PER_CUBE_DIMINISHED            = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 144 * 9;
+    public static final double EM_COUNT_PER_ITEM_DIMINISHED            = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 144;
+    public static final double EM_COUNT_PER_1k_DIMINISHED              = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 1000;
+
+    private final Map<Integer, EMFluidQuantizationInfo>               fluidQuantization;
+    private final Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization;
+    private final Map<Integer, EMOredictQuantizationInfo>             oredictQuantization;
+
+    private final Map<IEMDefinition, EMDequantizationInfo> infoMap;
+    private final Function<IEMStack, EMDequantizationInfo> creator;
+
+    public EMTransformationRegistry() {
+        this(EMDequantizationInfo::new);
+    }
+
+    public EMTransformationRegistry(Function<IEMStack, EMDequantizationInfo> creator) {
+        this(creator,
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
+                new HashMap<>(256)
+        );
+    }
+
+    public EMTransformationRegistry(Function<IEMStack, EMDequantizationInfo> creator,
+                                    Map<Integer, EMFluidQuantizationInfo> fluidQuantization,
+                                    Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization,
+                                    Map<Integer, EMOredictQuantizationInfo> oredictQuantization,
+                                    Map<IEMDefinition, EMDequantizationInfo> infoMap) {
+        this.creator = creator;
+        this.fluidQuantization = fluidQuantization;
+        this.itemQuantization = itemQuantization;
+        this.oredictQuantization = oredictQuantization;
+        this.infoMap = infoMap;
+    }
+
+    protected EMDequantizationInfo compute(IEMStack em) {
+        return infoMap.computeIfAbsent(em.getDefinition(), stack -> creator.apply(em));
+    }
+
+    public void addFluid(IEMStack em, FluidStack fluidStack) {
+        getFluidQuantization().put(fluidStack.getFluidID(), new EMFluidQuantizationInfo(fluidStack, em));
+        compute(em).setFluid(fluidStack);
+    }
+
+    public void addFluid(IEMStack em, Fluid fluid, int fluidAmount) {
+        addFluid(em, new FluidStack(fluid, fluidAmount));
+    }
+
+    protected void addItemQuantization(EMItemQuantizationInfo aIQI) {
+        getItemQuantization().put(aIQI, aIQI);
+    }
+
+    public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT) {
+        addItemQuantization(new EMItemQuantizationInfo(itemStack, skipNBT, em));
+        compute(em).setItem(itemStack);
+    }
+
+    public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT) {
+        addItem(em, GT_OreDictUnificator.get(prefix, material, amount), skipNBT);
+    }
+
+    public void addOredict(IEMStack em, int id, int qty) {
+        getOredictQuantization().put(id, new EMOredictQuantizationInfo(id, qty, em));
+        compute(em).setOre(new OreDictionaryStack(qty, id));
+    }
+
+    public void addOredict(IEMStack em, String name, int qty) {
+        addOredict(em, OreDictionary.getOreID(name), qty);
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty) {
+        addOredict(em, prefix, material.mName, qty);
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty) {
+        addOredict(em, OreDictionary.getOreID(prefix.name() + materialName), qty);
+    }
+
+    public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
+        return fluidQuantization;
+    }
+
+    public Map<EMItemQuantizationInfo, EMItemQuantizationInfo> getItemQuantization() {
+        return itemQuantization;
+    }
+
+    public Map<Integer, EMOredictQuantizationInfo> getOredictQuantization() {
+        return oredictQuantization;
+    }
+
+    public Map<IEMDefinition, EMDequantizationInfo> getInfoMap() {
+        return infoMap;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
deleted file mode 100644
index e20b0af3b5..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public interface IEMExchangeInfo<IN,OUT> {
-    OUT output();//what should be given - ItemStack,FluidStack,AspectStack, (EM definitionStack->)EM instance stack - etc.
-    //This must return new Object! - if obj is immutable don't care that much (applies to defStacks)
-
-    IN input();//same as above but for input
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java
new file mode 100644
index 0000000000..f5d8d42061
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java
@@ -0,0 +1,19 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+public class OreDictionaryStack {
+    private final int amount;
+    private final int id;
+
+    public OreDictionaryStack(int amount, int id) {
+        this.amount = amount;
+        this.id = id;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public int getOreId() {
+        return id;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 37ecb861f8..76f4457e94 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -1,69 +1,65 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
 
-import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.util.XSTR;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Materials;
-import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.*;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
+import static gregtech.api.enums.Materials.*;
 import static gregtech.api.enums.OrePrefixes.dust;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 18.11.2016.
  */
-public final class EMAtomDefinition extends EMComplexTemplate {
-    public static final long ATOM_COMPLEXITY_LIMIT=65536L;
-    private static final byte BYTE_OFFSET=32;
+public class EMAtomDefinition extends EMComplexTemplate {
+    public static final  long ATOM_COMPLEXITY_LIMIT = 65536L;
+    private static final byte BYTE_OFFSET           = 32;
 
-    private final int hash;
+    private final int    hash;
     public static double refMass, refUnstableMass;
 
-    private static final byte                                   nbtType                    = (byte) 'a';
+    private static final String                                 nbtType                    = "a";
     private static final Random                                 xstr                       = new XSTR();//NEEDS SEPARATE!
     private static       Map<Integer, TreeSet<Integer>>         stableIsotopes             = new HashMap<>();
     private static final Map<Integer, EMAtomDefinition>         stableAtoms                = new HashMap<>();
     private static       Map<Integer, TreeMap<Double, Integer>> mostStableUnstableIsotopes = new HashMap<>();
     private static final Map<Integer, EMAtomDefinition>         unstableAtoms              = new HashMap<>();
-    private static       EMDefinitionStack                      alpha,deuterium,tritium,helium_3,beryllium_8,carbon_14,neon_24,silicon_34;
-    private static final HashMap<EMAtomDefinition,Double> lifetimeOverrides = new HashMap<>();
+    private static       EMDefinitionStack                      alpha, deuterium, tritium, helium_3, beryllium_8, carbon_14, neon_24, silicon_34, uranium_238, uranium_235, plutonium_239, plutonium_241;
+    private static final HashMap<EMAtomDefinition, Double> lifetimeOverrides = new HashMap<>();
 
     private final EMNuclideIAEA iaea;
 
     private static EMAtomDefinition somethingHeavy;
+
     public static EMAtomDefinition getSomethingHeavy() {
         return somethingHeavy;
     }
 
     private static final ArrayList<Runnable> overrides = new ArrayList<>();
-    public static void addOverride(EMAtomDefinition atom, double rawLifeTime){
-        lifetimeOverrides.put(atom,rawLifeTime);
+
+    public static void addOverride(EMAtomDefinition atom, double rawLifeTime) {
+        lifetimeOverrides.put(atom, rawLifeTime);
     }
 
     //float-mass in eV/c^2
@@ -106,23 +102,23 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
         elementalStacks = things;
 
-        double mass = 0;
-        int cLeptons = 0;
-        int cNucleus = 0;
-        int neutralCount = 0, element = 0;
-        int type = 0;
+        double  mass         = 0;
+        int     cLeptons     = 0;
+        int     cNucleus     = 0;
+        int     neutralCount = 0, element = 0;
+        int     type         = 0;
         boolean containsAnti = false;
         for (EMDefinitionStack stack : elementalStacks.valuesToArray()) {
             IEMDefinition def    = stack.getDefinition();
             int           amount = (int) stack.getAmount();
-            if((int) stack.getAmount() != stack.getAmount()){
+            if ((int) stack.getAmount() != stack.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             mass += stack.getMass();
-            if (def.getMatterType() < 0) {
+            if (def.getGeneration() < 0) {
                 containsAnti = true;
             }
-            type = Math.max(type, Math.abs(def.getMatterType()));
+            type = Math.max(type, Math.abs(def.getGeneration()));
 
             if (def instanceof EMLeptonDefinition) {
                 cLeptons += stack.getCharge();
@@ -148,57 +144,57 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
         //stability curve
         int StableIsotope = stableIzoCurve(element);
-        int izoDiff = neutralCount - StableIsotope;
-        int izoDiffAbs = Math.abs(izoDiff);
+        int izoDiff       = neutralCount - StableIsotope;
+        int izoDiffAbs    = Math.abs(izoDiff);
 
         xstr.setSeed((element + 1L) * (neutralCount + 100L));
-        iaea = EMNuclideIAEA.get(element,neutralCount);
-        if(getIaea() !=null){
-            if(Double.isNaN(getIaea().getMass())) {
+        iaea = EMNuclideIAEA.get(element, neutralCount);
+        if (getIaea() != null) {
+            if (Double.isNaN(getIaea().getMass())) {
                 this.mass = mass;
             } else {
                 this.mass = getIaea().getMass();
             }
 
-            if(Double.isNaN(getIaea().getHalfTime())) {
-                Double overriddenLifeTime= lifetimeOverrides.get(this);
+            if (Double.isNaN(getIaea().getHalfTime())) {
+                Double overriddenLifeTime = lifetimeOverrides.get(this);
                 double rawLifeTimeTemp;
-                if(overriddenLifeTime!=null) {
+                if (overriddenLifeTime != null) {
                     rawLifeTimeTemp = overriddenLifeTime;
                 } else {
                     rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
                 }
                 rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
-            }else {
+            } else {
                 rawLifeTime = containsAnti ? getIaea().getHalfTime() * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) : getIaea().getHalfTime();
             }
-            iaeaDefinitionExistsAndHasEnergyLevels = getIaea().getEnergeticStatesArray().length>1;
-        }else{
-            this.mass=mass;
+            iaeaDefinitionExistsAndHasEnergyLevels = getIaea().getEnergeticStatesArray().length > 1;
+        } else {
+            this.mass = mass;
 
-            Double overriddenLifeTime= lifetimeOverrides.get(this);
+            Double overriddenLifeTime = lifetimeOverrides.get(this);
             double rawLifeTimeTemp;
-            if(overriddenLifeTime!=null) {
+            if (overriddenLifeTime != null) {
                 rawLifeTimeTemp = overriddenLifeTime;
             } else {
                 rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
             }
             rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
 
-            iaeaDefinitionExistsAndHasEnergyLevels =false;
+            iaeaDefinitionExistsAndHasEnergyLevels = false;
         }
 
-        if(getIaea() ==null || getIaea().getEnergeticStatesArray()[0].energy!=0) {
+        if (getIaea() == null || getIaea().getEnergeticStatesArray()[0].energy != 0) {
             if (izoDiff == 0) {
                 decayMode = 0;
             } else {
                 decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4);
             }
-        }else{
-            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4)+ BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
+        } else {
+            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
         }
         //this.stable = this.rawLifeTime >= STABLE_RAW_LIFE_TIME;
-        hash=super.hashCode();
+        hash = super.hashCode();
     }
 
     private static int stableIzoCurve(int element) {
@@ -267,7 +263,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
         boolean nuclei = false;
-        long qty=0;
+        long    qty    = 0;
         for (EMDefinitionStack stack : stacks.valuesToArray()) {
             if (stack.getDefinition() instanceof EMHadronDefinition) {
                 if (((EMHadronDefinition) stack.getDefinition()).getAmount() != 3) {
@@ -277,12 +273,12 @@ public final class EMAtomDefinition extends EMComplexTemplate {
             } else if (!(stack.getDefinition() instanceof EMLeptonDefinition)) {
                 return false;
             }
-            if((int) stack.getAmount() != stack.getAmount()){
+            if ((int) stack.getAmount() != stack.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
-            qty+= stack.getAmount();
+            qty += stack.getAmount();
         }
-        return nuclei && qty<ATOM_COMPLEXITY_LIMIT;
+        return nuclei && qty < ATOM_COMPLEXITY_LIMIT;
     }
 
     @Override
@@ -308,22 +304,22 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getMatterType() {
+    public int getGeneration() {
         return type;
     }
 
     @Override
     public double getRawTimeSpan(long currentEnergy) {
-        if(currentEnergy<=0) {
+        if (currentEnergy <= 0) {
             return rawLifeTime;
         }
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            if(currentEnergy>= getIaea().getEnergeticStatesArray().length){
-                return getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].Thalf/(currentEnergy- getIaea().getEnergeticStatesArray().length+1);
+        if (iaeaDefinitionExistsAndHasEnergyLevels) {
+            if (currentEnergy >= getIaea().getEnergeticStatesArray().length) {
+                return getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1].Thalf / (currentEnergy - getIaea().getEnergeticStatesArray().length + 1);
             }
-            return getIaea().getEnergeticStatesArray()[(int)currentEnergy].Thalf;
+            return getIaea().getEnergeticStatesArray()[(int) currentEnergy].Thalf;
         }
-        return rawLifeTime/(currentEnergy+1);
+        return rawLifeTime / (currentEnergy + 1);
     }
 
     @Override
@@ -332,16 +328,16 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return -10;
     }
 
     @Override
     public String getLocalizedName() {
-        int element = Math.abs(this.getElement());
+        int     element  = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
-            if (Math.abs(getMatterType()) != 1) {
+            if (Math.abs(getGeneration()) != 1) {
                 return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
             }
             return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
@@ -349,35 +345,35 @@ public final class EMAtomDefinition extends EMComplexTemplate {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
-            return translateToLocal("tt.keyword.Element")+(negative ? ": ~" : ": ") + element;
+            return translateToLocal("tt.keyword.Element") + (negative ? ": ~" : ": ") + element;
         }
     }
 
     @Override
     public String getSymbol() {
-        int element = Math.abs(this.getElement());
+        int     element  = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
             try {
                 int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
             } catch (Exception E) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
-                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
             }
         }
     }
 
     @Override
     public String getShortSymbol() {
-        int element = Math.abs(this.getElement());
+        int     element  = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
             return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
@@ -404,69 +400,69 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public EMDecay[] getDecayArray() {
-        ArrayList<EMDecay> decaysList =new ArrayList<>(4);
-        return getDecayArray(decaysList, getDecayMode(),true);
+        ArrayList<EMDecay> decaysList = new ArrayList<>(4);
+        return getDecayArray(decaysList, getDecayMode(), true);
     }
 
     private EMDecay[] getDecayArray(ArrayList<EMDecay> decaysList, int decayMode, boolean tryAnti) {//todo?
-        if (getMatterType() == 1) {
+        if (getGeneration() == 1) {
             switch (decayMode) {
                 case -2:
-                    if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
+                    if (TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
-                    } else if(PbetaDecay(decaysList)) {
+                    } else if (PbetaDecay(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case -1:
-                    if(Emmision(decaysList, EMHadronDefinition.hadron_p1)) {
+                    if (Emmision(decaysList, EMHadronDefinition.hadron_p1)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case 0:
-                    if(alphaDecay(decaysList)) {
+                    if (alphaDecay(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case 1:
-                    if(Emmision(decaysList, EMHadronDefinition.hadron_n1)) {
+                    if (Emmision(decaysList, EMHadronDefinition.hadron_n1)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case 2:
-                    if(MbetaDecay(decaysList)) {
+                    if (MbetaDecay(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 default:
-                    if(decayMode>8){
-                        if(iaeaDecay(decaysList,0)) {
+                    if (decayMode > 8) {
+                        if (iaeaDecay(decaysList, 0)) {
                             return decaysList.toArray(EMDecay.NO_PRODUCT);
                         }
-                        return getDecayArray(decaysList,decayMode- BYTE_OFFSET,false);
+                        return getDecayArray(decaysList, decayMode - BYTE_OFFSET, false);
                     }
             }
             return EMDecay.NO_DECAY;
-        }else if(getMatterType() ==-1){
-            EMAtomDefinition anti =getAnti();
-            if(anti!=null) {
+        } else if (getGeneration() == -1) {
+            EMAtomDefinition anti = getAnti();
+            if (anti != null) {
                 return anti.getDecayArray(decaysList, decayMode, false);
             }
         }
         return getNaturalDecayInstant();
     }
 
-    private boolean iaeaDecay(ArrayList<EMDecay> decaysList, long energy){
+    private boolean iaeaDecay(ArrayList<EMDecay> decaysList, long energy) {
         EMNuclideIAEA.energeticState state;
-        if(energy> getIaea().getEnergeticStatesArray().length) {
+        if (energy > getIaea().getEnergeticStatesArray().length) {
             state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
-        } else if(energy<=0) {
+        } else if (energy <= 0) {
             state = getIaea().getEnergeticStatesArray()[0];
         } else {
             state = getIaea().getEnergeticStatesArray()[(int) energy];
         }
-        for (int i=0;i<state.decaymodes.length;i++){
-            if(!getDecayFromIaea(decaysList,state.decaymodes[i],energy)) {
+        for (int i = 0; i < state.decaymodes.length; i++) {
+            if (!getDecayFromIaea(decaysList, state.decaymodes[i], energy)) {
                 decaysList.clear();
                 return false;
             }
@@ -474,511 +470,553 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         return !decaysList.isEmpty();
     }
 
-    private boolean getDecayFromIaea(ArrayList<EMDecay> decaysList, EMNuclideIAEA.iaeaDecay decay, long energy){
-        EMDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new EMDefinitionStackMap();
-        switch (decay.decayName){
+    private boolean getDecayFromIaea(ArrayList<EMDecay> decaysList, EMNuclideIAEA.iaeaDecay decay, long energy) {
+        EMDefinitionStackMap withThis = elementalStacks.toMutable(), newStuff = new EMDefinitionStackMap();
+        switch (decay.decayName) {
             case "D": {
-                if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())) {
                     withThis.putReplace(deuterium);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "3H": {
-                if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())) {
                     withThis.putReplace(tritium);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "3HE": {
-                if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())) {
                     withThis.putReplace(helium_3);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "8BE": {
-                if (withThis.removeAllAmountsExact(beryllium_8.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(beryllium_8.getDefinition().getSubParticles())) {
                     withThis.putReplace(beryllium_8);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "14C": {
-                if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())) {
                     newStuff.putReplace(carbon_14);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "24NE": {
-                if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())) {
                     newStuff.putReplace(neon_24);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "34SI": {
-                if (withThis.removeAllAmountsExact(silicon_34.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(silicon_34.getDefinition().getSubParticles())) {
                     newStuff.putReplace(silicon_34);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "A": case "A?": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)){
+            }
+            break;
+            case "A":
+            case "A?": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)) {
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_2);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2B-": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e2);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "EC": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2EC": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "B++EC": case "EC+B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+            }
+            break;
+            case "B++EC":
+            case "EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+A": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+2P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-A": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(EMHadronDefinition.hadron_n1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-2N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(EMHadronDefinition.hadron_n2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "ECA": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)) {
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "ECP": {
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "EC2P": {
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "ECP+EC2P": {//todo look at branching ratios
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
                     newStuff.putReplace(EMHadronDefinition.hadron_p3);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_n1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_n2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_p2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "SF": {
                 if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                     return true;
                 }
-            } break;
+            }
+            break;
             case "B-F": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "ECF": case "ECSF": case "EC(+SF)": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+            }
+            break;
+            case "ECF":
+            case "ECSF":
+            case "EC(+SF)": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "SF(+EC+B+)": case "SF+EC+B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+            }
+            break;
+            case "SF(+EC+B+)":
+            case "SF+EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "SF+EC+B-": {
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "IT": case "IT?": case "G": {
-                if(energy>0){
+            }
+            break;
+            case "IT":
+            case "IT?":
+            case "G": {
+                if (energy > 0) {
                     decaysList.add(new EMDecay(decay.chance, this, boson_Y__));
-                }else{
-                    if(DEBUG_MODE) {
+                } else {
+                    if (DEBUG_MODE) {
                         TecTech.LOGGER.info("Tried to emit Gamma from ground state");
                     }
                     decaysList.add(new EMDecay(decay.chance, this));
@@ -986,28 +1024,30 @@ public final class EMAtomDefinition extends EMComplexTemplate {
                 return true;
             } //break;
             case "IT+EC+B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    newStuff.putReplace(EMBosonDefinition.boson_Y__1);
-                    try{
+                    newStuff.putReplace(EMGaugeBosonDefinition.boson_Y__1);
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "DEAD_END":
                 decaysList.add(deadEnd);
                 return true;
-            default: throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + getNeutralCount() + ' ' + getElement());
+            default:
+                throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + getNeutralCount() + ' ' + getElement());
         }
-        if(DEBUG_MODE) {
+        if (DEBUG_MODE) {
             TecTech.LOGGER.info("Failed to decay " + getElement() + ' ' + getNeutralCount() + ' ' + decay.decayName);
         }
         return false;
@@ -1093,48 +1133,48 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     private boolean Fission(ArrayList<EMDecay> decaysList, EMDefinitionStackMap fissile, EMDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
         EMDefinitionStackMap heavy      = new EMDefinitionStackMap();
-        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement())<=97);
+        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement()) <= 97);
 
-        for(EMDefinitionStack stack: fissile.valuesToArray()){
-            if(spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
-                    (stack.getAmount() <=80 || stack.getAmount() <90 && XSTR_INSTANCE.nextInt(10)< stack.getAmount() -80)) {
+        for (EMDefinitionStack stack : fissile.valuesToArray()) {
+            if (spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
+                    (stack.getAmount() <= 80 || stack.getAmount() < 90 && XSTR_INSTANCE.nextInt(10) < stack.getAmount() - 80)) {
                 return false;
             }
-            if(stack.getDefinition().getCharge()==0){
+            if (stack.getDefinition().getCharge() == 0) {
                 //if(stack.definition instanceof dHadronDefinition){
-                    double neutrals= stack.getAmount() *liquidDrop[2];
-                    int neutrals_cnt=(int)Math.floor(neutrals);
-                    neutrals_cnt+=neutrals-neutrals_cnt>XSTR_INSTANCE.nextDouble()?1:0;
-                    particles.putUnifyExact(new EMDefinitionStack(stack.getDefinition(), neutrals_cnt));
-
-                    int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[1]);
-                    while(heavy_cnt+neutrals_cnt> stack.getAmount()) {
-                        heavy_cnt--;
-                    }
-                    fissile.removeAmountExact(new EMDefinitionStack(stack.getDefinition(),heavy_cnt+neutrals_cnt));
-                    heavy.putReplace(new EMDefinitionStack(stack.getDefinition(), heavy_cnt));
+                double neutrals     = stack.getAmount() * liquidDrop[2];
+                int    neutrals_cnt = (int) Math.floor(neutrals);
+                neutrals_cnt += neutrals - neutrals_cnt > XSTR_INSTANCE.nextDouble() ? 1 : 0;
+                particles.putUnifyExact(new EMDefinitionStack(stack.getDefinition(), neutrals_cnt));
+
+                int heavy_cnt = (int) Math.ceil(stack.getAmount() * liquidDrop[1]);
+                while (heavy_cnt + neutrals_cnt > stack.getAmount()) {
+                    heavy_cnt--;
+                }
+                fissile.removeAmountExact(new EMDefinitionStack(stack.getDefinition(), heavy_cnt + neutrals_cnt));
+                heavy.putReplace(new EMDefinitionStack(stack.getDefinition(), heavy_cnt));
                 //}else{
                 //    particles.add(stack);
                 //    light.remove(stack.definition);
                 //}
-            }else{
-                int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[0]);
-                if(heavy_cnt%2==1 && XSTR_INSTANCE.nextDouble()>0.05D) {
+            } else {
+                int heavy_cnt = (int) Math.ceil(stack.getAmount() * liquidDrop[0]);
+                if (heavy_cnt % 2 == 1 && XSTR_INSTANCE.nextDouble() > 0.05D) {
                     heavy_cnt--;
                 }
-                EMDefinitionStack new_stack =new EMDefinitionStack(stack.getDefinition(), heavy_cnt);
+                EMDefinitionStack new_stack = new EMDefinitionStack(stack.getDefinition(), heavy_cnt);
                 fissile.removeAmountExact(new_stack);
                 heavy.putReplace(new_stack);
             }
         }
 
         try {
-            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
-            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1));
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1));
             decaysList.add(new EMDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
             return true;
         } catch (Exception e) {
-            if(DEBUG_MODE) {
+            if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
@@ -1181,51 +1221,51 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
         if (iaeaDefinitionExistsAndHasEnergyLevels) {
-            ArrayList<EMDecay> decays =new ArrayList<>(4);
-            if(iaeaDecay(decays,energyLevel)){
+            ArrayList<EMDecay> decays = new ArrayList<>(4);
+            if (iaeaDecay(decays, energyLevel)) {
                 return decays.toArray(EMDecay.NO_PRODUCT);
             }
         }
-        if(energyLevel< Math.abs(getCharge())/3+ getNeutralCount()) {
+        if (energyLevel < Math.abs(getCharge()) / 3 + getNeutralCount()) {
             return new EMDecay[]{new EMDecay(1, this, boson_Y__)};
         }
         return getNaturalDecayInstant();
     }
 
     @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel,long newEnergyLevel) {
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            double result=0;
-            boolean backwards=newEnergyLevel<currentEnergyLevel;
-            if(backwards){
-                long temp=currentEnergyLevel;
-                currentEnergyLevel=newEnergyLevel;
-                newEnergyLevel=temp;
-            }
-
-            if(currentEnergyLevel<=0){
-                if(newEnergyLevel<=0) {
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        if (iaeaDefinitionExistsAndHasEnergyLevels) {
+            double  result    = 0;
+            boolean backwards = newEnergyLevel < currentEnergyLevel;
+            if (backwards) {
+                long temp = currentEnergyLevel;
+                currentEnergyLevel = newEnergyLevel;
+                newEnergyLevel = temp;
+            }
+
+            if (currentEnergyLevel <= 0) {
+                if (newEnergyLevel <= 0) {
                     return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
                 } else {
                     result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * -currentEnergyLevel;
                 }
-            }else {
+            } else {
                 result -= getIaea().getEnergeticStatesArray()[(int) Math.min(getIaea().getEnergeticStatesArray().length - 1, currentEnergyLevel)].energy;
             }
-            if(newEnergyLevel>= getIaea().getEnergeticStatesArray().length){
-                if(currentEnergyLevel>= getIaea().getEnergeticStatesArray().length) {
+            if (newEnergyLevel >= getIaea().getEnergeticStatesArray().length) {
+                if (currentEnergyLevel >= getIaea().getEnergeticStatesArray().length) {
                     return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
                 } else {
                     result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - getIaea().getEnergeticStatesArray().length + 1);
                 }
-                result+= getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].energy;
-            }else {
+                result += getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1].energy;
+            } else {
                 result += getIaea().getEnergeticStatesArray()[(int) newEnergyLevel].energy;
             }
 
-            return backwards?-result:result;
+            return backwards ? -result : result;
         }
-        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
     }
 
     @Override
@@ -1235,17 +1275,17 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public boolean usesMultipleDecayCalls(long energyLevel) {
-        if(!iaeaDefinitionExistsAndHasEnergyLevels) return false;
+        if (!iaeaDefinitionExistsAndHasEnergyLevels) return false;
         EMNuclideIAEA.energeticState state;
-        if(energyLevel> getIaea().getEnergeticStatesArray().length) {
+        if (energyLevel > getIaea().getEnergeticStatesArray().length) {
             state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
-        } else if(energyLevel<=0) {
+        } else if (energyLevel <= 0) {
             state = getIaea().getEnergeticStatesArray()[0];
         } else {
             state = getIaea().getEnergeticStatesArray()[(int) energyLevel];
         }
-        for (EMNuclideIAEA.iaeaDecay decay:state.decaymodes){
-            if(decay.decayName.contains("F")) return true;//if is fissile
+        for (EMNuclideIAEA.iaeaDecay decay : state.decaymodes) {
+            if (decay.decayName.contains("F")) return true;//if is fissile
         }
         return false;
     }
@@ -1257,7 +1297,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public boolean fusionMakesEnergy(long energyLevel) {
-        return getIaea() !=null || iaeaDefinitionExistsAndHasEnergyLevels;
+        return getIaea() != null || iaeaDefinitionExistsAndHasEnergyLevels;
     }
 
     @Override
@@ -1265,7 +1305,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         //disembody
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
-            if (elementalStack.getDefinition().getMatterType() == 1 || elementalStack.getDefinition().getMatterType() == -1) {
+            if (elementalStack.getDefinition().getGeneration() == 1 || elementalStack.getDefinition().getGeneration() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(elementalStack);
             } else {
@@ -1278,10 +1318,10 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     //@Override
     //public iElementalDefinition getAnti() {
-    //    cElementalDefinitionStack[] stacks = this.elementalStacks.values();
-    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
+    //    EMDefinitionStack[] stacks = this.elementalStacks.values();
+    //    EMDefinitionStack[] antiElements = new EMDefinitionStack[stacks.length];
     //    for (int i = 0; i < antiElements.length; i++) {
-    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
+    //        antiElements[i] = new EMDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
     //    }
     //    try {
     //        return new dAtomDefinition(false, antiElements);
@@ -1307,21 +1347,6 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
     }
 
-    @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return EMTransformationInfo.TRANSFORMATION_INFO.getFluidDequantization().get(this);
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return EMTransformationInfo.TRANSFORMATION_INFO.getItemDequantization().get(this);
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return EMTransformationInfo.TRANSFORMATION_INFO.getOredictDequantization().get(this);
-    }
-
     public EMNuclideIAEA getIaea() {
         return iaea;
     }
@@ -1339,55 +1364,43 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     private static final class Nomenclature {
-        private static final String[] SYMBOL = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
-        private static final String[] NAME = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+        private static final String[] SYMBOL       = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
+        private static final String[] NAME         = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
         private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
     }
 
     @Override
-    protected int getIndirectTagValue() {
+    protected String getIndirectTagValue() {
         return nbtType;
     }
 
-    public static EMAtomDefinition fromNBT(NBTTagCompound nbt) {
-        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new EMAtomDefinition(stacks);
-        } catch (EMException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(nbtType, new EMIndirectType((definitionsRegistry, nbt) ->
+                new EMAtomDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), EMAtomDefinition.class, "tt.keyword.Element"));
+        EMNuclideIAEA.run();
 
-    public static void run() {
         for (Runnable r : overrides) {
             r.run();
         }
 
-        for(Map.Entry<EMAtomDefinition,Double> entry:lifetimeOverrides.entrySet()){
+        for (Map.Entry<EMAtomDefinition, Double> entry : lifetimeOverrides.entrySet()) {
             try {
                 lifetimeOverrides.put(new EMAtomDefinition(entry.getKey().elementalStacks), entry.getValue());
-            }catch (EMException e){
+            } catch (EMException e) {
                 e.printStackTrace(); //Impossible
             }
         }
 
         //populate stable isotopes
-        for (int element = 1; element < 83; element++)//Up to Bismuth exclusive
-        {
+        for (int element = 1; element < 83; element++) {//Up to Bismuth exclusive
             for (int isotope = 0; isotope < 130; isotope++) {
                 xstr.setSeed((long) (element + 1) * (isotope + 100));
                 //stability curve
-                int StableIsotope = stableIzoCurve(element);
-                int izoDiff = isotope - StableIsotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double        rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                EMNuclideIAEA nuclide     = EMNuclideIAEA.get(element, isotope);
+                int           StableIsotope = stableIzoCurve(element);
+                int           izoDiff       = isotope - StableIsotope;
+                int           izoDiffAbs    = Math.abs(izoDiff);
+                double        rawLifeTime   = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                EMNuclideIAEA nuclide       = EMNuclideIAEA.get(element, isotope);
                 if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.getHalfTime() >= STABLE_RAW_LIFE_TIME) {
                     TreeSet<Integer> isotopes = stableIsotopes.computeIfAbsent(element, k -> new TreeSet<>());
                     isotopes.add(isotope);
@@ -1396,16 +1409,16 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
 
         //populate unstable isotopes
-        for (int element = 83; element < 150; element++) {
+        for (int element = 1; element < 150; element++) {
             for (int isotope = 100; isotope < 180; isotope++) {
                 xstr.setSeed((long) (element + 1) * (isotope + 100));
                 //stability curve
-                int Isotope = stableIzoCurve(element);
-                int izoDiff = isotope - Isotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                TreeMap<Double, Integer> isotopes = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
-                isotopes.put(rawLifeTime, isotope);
+                int                      Isotope     = stableIzoCurve(element);
+                int                      izoDiff     = isotope - Isotope;
+                int                      izoDiffAbs  = Math.abs(izoDiff);
+                double                   rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                TreeMap<Double, Integer> isotopes    = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
+                isotopes.put(rawLifeTime, isotope);//todo dont add stable ones
             }
         }
 
@@ -1428,213 +1441,221 @@ public final class EMAtomDefinition extends EMComplexTemplate {
                     TecTech.LOGGER.info("Added Unstable Atom:" + integerTreeMapEntry.getKey() + ' ' + integerTreeMapEntry.getValue().lastEntry().getValue() + ' ' + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass());
                 }
             }
-            deuterium=new EMAtomDefinition(
+
+            deuterium = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p1,
                     EMHadronDefinition.hadron_n1,
                     EMLeptonDefinition.lepton_e1).getStackForm(1);
-            tritium=new EMAtomDefinition(
+            registry.registerForDisplay(deuterium.getDefinition());
+
+            tritium = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p1,
                     EMHadronDefinition.hadron_n2,
                     EMLeptonDefinition.lepton_e1).getStackForm(1);
-            helium_3=new EMAtomDefinition(
+            registry.registerForDisplay(tritium.getDefinition());
+
+            helium_3 = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p2,
                     EMHadronDefinition.hadron_n1,
                     EMLeptonDefinition.lepton_e2).getStackForm(1);
+            registry.registerForDisplay(helium_3.getDefinition());
+
             alpha = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p2,
                     EMHadronDefinition.hadron_n2).getStackForm(1);
-            beryllium_8=new EMAtomDefinition(
+            registry.registerForDisplay(alpha.getDefinition());
+
+            beryllium_8 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 4),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 4),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 4)).getStackForm(1);
-            carbon_14=new EMAtomDefinition(
+            registry.registerForDisplay(beryllium_8.getDefinition());
+
+            carbon_14 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 6),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 8),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 6)).getStackForm(1);
-            neon_24=new EMAtomDefinition(
+            registry.registerForDisplay(carbon_14.getDefinition());
+
+            neon_24 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 10),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 14),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 10)).getStackForm(1);
-            silicon_34=new EMAtomDefinition(
+            registry.registerForDisplay(neon_24.getDefinition());
+
+            silicon_34 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 14),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 20),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 14)).getStackForm(1);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMAtomDefinition::fromNBT,EMAtomDefinition.class,getClassTypeStatic());
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + getClassTypeStatic());
-        }
-    }
-
-    public static void setTransformations(){
-        /*----STABLE ATOMS----**/
-        refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
-
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
-
-        /*----UNSTABLE ATOMS----**/
-        refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
-
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
-
-        try {
-            EMAtomDefinition temp;
-            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(deuterium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
-
-            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(tritium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
+            registry.registerForDisplay(silicon_34.getDefinition());
 
-            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(helium_3.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
-
-            temp=new EMAtomDefinition(
+            uranium_238 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
-
-            double tempMass=temp.getMass();
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)).getStackForm(1);
+            registry.registerForDisplay(uranium_238.getDefinition());
 
-            temp=new EMAtomDefinition(
+            uranium_235 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)).getStackForm(1);
+            registry.registerForDisplay(uranium_235.getDefinition());
 
-            TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
+            TecTech.LOGGER.info("Diff Mass U : " + (uranium_238.getDefinition().getMass() - uranium_235.getDefinition().getMass()));
 
-            temp=new EMAtomDefinition(
+            plutonium_239 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)).getStackForm(1);
+            registry.registerForDisplay(plutonium_239.getDefinition());
 
-            somethingHeavy=new EMAtomDefinition(
+            plutonium_241 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)).getStackForm(1);
+            registry.registerForDisplay(plutonium_241.getDefinition());
 
-            TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
+            TecTech.LOGGER.info("Diff Mass Pu: " + (plutonium_241.getDefinition().getMass() - plutonium_239.getDefinition().getMass()));
 
-            TecTech.LOGGER.info("Neutron Mass: "+ EMHadronDefinition.hadron_n.getMass());
+            somethingHeavy=(EMAtomDefinition) plutonium_241.getDefinition();
 
-        } catch (EMException e) {
+        } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
 
-        if(Loader.isModLoaded(Reference.GTPLUSPLUS)) {
-            new GtppAtomLoader().run();
+        if (DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + getClassTypeStatic());
+        }
+
+        for (int i = 1; i <= 118; i++) {
+            EMAtomDefinition firstStableIsotope = getFirstStableIsotope(i);
+            if(firstStableIsotope==null){
+                firstStableIsotope = getBestUnstableIsotope(i);
+                if(firstStableIsotope==null){
+                    continue;
+                }
+            }
+            registry.registerForDisplay(firstStableIsotope);
         }
     }
 
+    public static void setTransformations(EMTransformationRegistry transformationInfo) {
+        /*----STABLE ATOMS----**/
+        refMass = getFirstStableIsotope(1).getMass() * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(1), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Hydrogen.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(2), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Helium.mGas, 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(3), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lithium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(4), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Beryllium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(5), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Boron, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(6), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Carbon, 1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(7), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Nitrogen.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(8), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Oxygen.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(9), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Fluorine.mGas, 144);
+        //transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Neon.mGas.getID(), 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(11), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Sodium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(12), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Magnesium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(13), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Aluminium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(14), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Silicon, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(15), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Phosphorus, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(16), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Sulfur, 1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(17), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Argon.mGas, 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(19), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Potassium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(20), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Calcium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(21), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Scandium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(22), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Titanium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(23), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Vanadium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(24), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Chrome, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(25), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Manganese, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(26), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Iron, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(27), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Cobalt, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(28), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Nickel, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(29), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Copper, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(30), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Zinc, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(31), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Gallium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),dust, Germanium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(33), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Arsenic, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),dust, Selenium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),dust, Bromine,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),dust, Krypton,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(37), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Rubidium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(38), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Strontium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(39), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Yttrium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),dust, Zirconium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(41), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Niobium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(42), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Molybdenum, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),dust, Technetium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),dust, Ruthenium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),dust, Rhodium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(46), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Palladium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(47), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Silver, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(48), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Cadmium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(49), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Indium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(50), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tin, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(51), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Antimony, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(52), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tellurium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),dust, Iodine,1);
+        //transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Xenon.mGas.getID(), 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(55), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Caesium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(56), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Barium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(57), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lanthanum, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(58), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Cerium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(59), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Praseodymium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(60), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Neodymium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(62), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Samarium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(63), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Europium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(64), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Gadolinium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(65), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Terbium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(66), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Dysprosium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(67), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Holmium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(68), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Erbium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(69), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Thulium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(70), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Ytterbium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(71), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lutetium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),dust, Hafnum,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(73), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tantalum, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(74), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tungsten, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),dust, Rhenium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(76), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Osmium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(77), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Iridium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(78), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Platinum, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(79), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Gold, 1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(80), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Mercury.mFluid, 144);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),dust, Thallium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(82), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lead, 1);
+
+        /*----UNSTABLE ATOMS----**/
+        refUnstableMass = getFirstStableIsotope(82).getMass() * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(61), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Promethium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(83), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Bismuth, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),dust, Polonium,1);
+        //transformationInfo.addFluid(new EMDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Astatine.mPlasma.getID(), 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getBestUnstableIsotope(86), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Radon.mGas, 144);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),dust, Francium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),dust, Radium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),dust, Actinium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(90), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Thorium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),dust, Protactinium,1);
+        ////transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Uranium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),dust, Neptunium,1);
+        ////transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Plutonium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(95), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Americium, 1);
+
+
+        transformationInfo.addFluid(new EMDefinitionStack(deuterium.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Deuterium.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(tritium.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Tritium.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(helium_3.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Helium_3.mGas, 144);
+
+        transformationInfo.addOredict(new EMDefinitionStack(uranium_238.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Uranium/*238*/, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(uranium_235.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Uranium235, 1);
+
+        transformationInfo.addOredict(new EMDefinitionStack(plutonium_239.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Plutonium/*239*/, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(plutonium_241.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Plutonium241, 1);
+    }
+
     public static EMAtomDefinition getFirstStableIsotope(int element) {
         return stableAtoms.get(element);
     }
@@ -1644,11 +1665,11 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getClassType() {
+    public int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic(){
+    public static int getClassTypeStatic() {
         return 64;
     }
 
@@ -1659,36 +1680,36 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
+        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+ getLocalizedName());
-            lines.add("SYMBOL = "+getSymbol());
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = " + getLocalizedName());
+            lines.add("SYMBOL = " + getSymbol());
         }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
         }
-        if(iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){
-            for(int i = 1; i< getIaea().getEnergeticStatesArray().length; i++){
-                lines.add("E LEVEL "+i+" = "+ getIaea().getEnergeticStatesArray()[i].energy+" eV");
+        if (iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES, capabilities)) {
+            for (int i = 1; i < getIaea().getEnergeticStatesArray().length; i++) {
+                lines.add("E LEVEL " + i + " = " + getIaea().getEnergeticStatesArray()[i].energy + " eV");
             }
         }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("HALF LIFE = " + getRawTimeSpan(energyLevel) + " s");
             lines.add("    At current energy level");
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index c1db8e4460..aedb11ac05 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -4,21 +4,20 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.OreDictionaryStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
 import com.github.technus.tectech.util.Util;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
@@ -26,29 +25,28 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static gregtech.api.enums.OrePrefixes.dust;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 17.11.2016.
  */
-public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i/o
+public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i/o
     private final int hash;
 
-    private static final byte                           nbtType    = (byte) 'h';
+    private static final String                          nbtType              = "h";
     //Helpers
-    public static final  Map<EMHadronDefinition,String> SYMBOL_MAP =new HashMap<>();
-    public static final  Map<EMHadronDefinition,String> NAME_MAP   =new HashMap<>();
-    public static        EMHadronDefinition             hadron_p, hadron_n, hadron_p_, hadron_n_;
+    public static final  Map<EMHadronDefinition, String> SYMBOL_MAP           = new HashMap<>();
+    public static final  Map<EMHadronDefinition, String> UNLOCALIZED_NAME_MAP = new HashMap<>();
+    public static        EMHadronDefinition              hadron_p, hadron_n, hadron_p_, hadron_n_;
     public static EMDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3, hadron_p5;
-    private static double protonMass = 0D;
-    private static double neutronMass = 0D;
-    private static final double actualProtonMass=938272081.3D;
-    private static final double actualNeutronMass=939565413.3D;
+    private static       double protonMass        = 0D;
+    private static       double neutronMass       = 0D;
+    private static final double actualProtonMass  = 938272081.3D;
+    private static final double actualNeutronMass = 939565413.3D;
 
     //float-mass in eV/c^2
     private final double mass;
@@ -81,20 +79,20 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         }
         quarkStacks = quarks;
 
-        int amount = 0;
-        int charge = 0;
-        int type = 0;
+        int     amount       = 0;
+        int     charge       = 0;
+        int     type         = 0;
         boolean containsAnti = false;
-        double mass = 0;
+        double  mass         = 0;
         for (EMDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
             amount += quarkStack.getAmount();
-            if((int) quarkStack.getAmount() != quarkStack.getAmount()){
+            if ((int) quarkStack.getAmount() != quarkStack.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             mass += quarkStack.getMass();
             charge += quarkStack.getCharge();
-            type = Math.max(Math.abs(quarkStack.getDefinition().getMatterType()), type);
-            if (quarkStack.getDefinition().getMatterType() < 0) {
+            type = Math.max(Math.abs(quarkStack.getDefinition().getGeneration()), type);
+            if (quarkStack.getDefinition().getGeneration() < 0) {
                 containsAnti = true;
             }
         }
@@ -106,10 +104,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
         if (mass == protonMass && this.getAmount() == 3) {
             rawLifeTime = IEMDefinition.STABLE_RAW_LIFE_TIME;
-            mass=actualProtonMass;
+            mass = actualProtonMass;
         } else if (mass == neutronMass && this.getAmount() == 3) {
             rawLifeTime = 882D;
-            mass=actualNeutronMass;
+            mass = actualNeutronMass;
         } else {
             if (this.getAmount() == 3) {
                 rawLifeTime = 1.34D / mass * Math.pow(9.81, charge);
@@ -119,8 +117,8 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
                 rawLifeTime = 1.21D / mass / Math.pow(9.80, charge);
             }
         }
-        this.mass=mass;
-        hash=super.hashCode();
+        this.mass = mass;
+        hash = super.hashCode();
     }
 
     //public but u can just try{}catch(){} the constructor it still calls this method
@@ -130,7 +128,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             if (!(quarks.getDefinition() instanceof EMQuarkDefinition)) {
                 return false;
             }
-            if((int) quarks.getAmount() != quarks.getAmount()){
+            if ((int) quarks.getAmount() != quarks.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             amount += quarks.getAmount();
@@ -140,12 +138,12 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public String getLocalizedName() {
-        StringBuilder name= new StringBuilder(getSimpleName());
+        StringBuilder name = new StringBuilder(getSimpleName());
         name.append(':');
-        String sym= translateToLocal(NAME_MAP.get(this));
-        if(sym!=null){
+        String sym = translateToLocal(UNLOCALIZED_NAME_MAP.get(this));
+        if (sym != null) {
             name.append(' ').append(sym);
-        }else {
+        } else {
             for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
                 name.append(' ').append(quark.getDefinition().getSymbol()).append((int) quark.getAmount());
             }
@@ -172,10 +170,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public String getSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
+        String sym = SYMBOL_MAP.get(this);
+        if (sym != null) {
             return sym;
-        }else {
+        } else {
             StringBuilder symbol = new StringBuilder(8);
             for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.getAmount(); i++) {
@@ -188,10 +186,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public String getShortSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
+        String sym = SYMBOL_MAP.get(this);
+        if (sym != null) {
             return sym;
-        }else {
+        } else {
             StringBuilder symbol = new StringBuilder(8);
             for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.getAmount(); i++) {
@@ -203,7 +201,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return -7;
     }
 
@@ -215,12 +213,12 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     @Override
     public EMDecay[] getNaturalDecayInstant() {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) {
             return EMDecay.NO_PRODUCT;
         }
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack quarks : quarkStacks) {
-            if (quarks.getDefinition().getMatterType() == 1 || quarks.getDefinition().getMatterType() == -1) {
+            if (quarks.getDefinition().getGeneration() == 1 || quarks.getDefinition().getGeneration() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(quarks);
             } else {
@@ -230,22 +228,22 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         }
         return new EMDecay[]{
                 new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])),
-                EMBosonDefinition.deadEnd
+                deadEnd
         };
     }
 
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) {
             return EMDecay.NO_PRODUCT;
         }
-        return new EMDecay[]{new EMDecay(0.75D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+        return new EMDecay[]{new EMDecay(0.75D, quarkStacks), deadEnd}; //decay into quarks
     }
 
     @Override
     public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
     }
 
     @Override
@@ -273,10 +271,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (getAmount() == 2 && quarkStacks.length == 2 &&
                 quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() &&
-                quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
+                quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) {
             return EMDecay.NO_PRODUCT;
         } else if (getAmount() != 3) {
-            return new EMDecay[]{new EMDecay(0.95D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+            return new EMDecay[]{new EMDecay(0.95D, quarkStacks), deadEnd}; //decay into quarks
         } else {
             ArrayList<EMQuarkDefinition> newBaryon = new ArrayList<>();
             IEMDefinition[]              Particles = new IEMDefinition[2];
@@ -289,7 +287,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             EMQuarkDefinition lastQuark = newBaryon.remove(2);
 
             EMDefinitionStack[] decay;
-            if (Math.abs(lastQuark.getMatterType()) > 1) {
+            if (Math.abs(lastQuark.getGeneration()) > 1) {
                 decay = lastQuark.getDecayArray()[1].getOutputStacks().valuesToArray();
             } else {
                 decay = lastQuark.getDecayArray()[2].getOutputStacks().valuesToArray();
@@ -299,19 +297,19 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             Particles[1] = decay[2].getDefinition();
 
             EMDefinitionStack[] contentOfBaryon = newBaryon.stream()
-                    .map(eQuarkDefinition -> new EMDefinitionStack(eQuarkDefinition,1))
+                    .map(eQuarkDefinition -> new EMDefinitionStack(eQuarkDefinition, 1))
                     .toArray(EMDefinitionStack[]::new);
 
             try {
                 return new EMDecay[]{
                         new EMDecay(0.001D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__),
                         new EMDecay(0.99D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
-                        EMBosonDefinition.deadEnd};
+                        deadEnd};
             } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
-                return new EMDecay[]{EMBosonDefinition.deadEnd};
+                return new EMDecay[]{deadEnd};
             }
         }
     }
@@ -337,7 +335,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     }
 
     @Override
-    public byte getMatterType() {
+    public int getGeneration() {
         return type;
     }
 
@@ -373,64 +371,48 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     }
 
     @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    protected int getIndirectTagValue() {
+    protected String getIndirectTagValue() {
         return nbtType;
     }
 
-    public static EMHadronDefinition fromNBT(NBTTagCompound nbt) {
-        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new EMHadronDefinition(stacks);
-        } catch (EMException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    public static void run() {
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(nbtType, new EMIndirectType((definitionsRegistry, nbt) ->
+                new EMHadronDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), EMHadronDefinition.class, "tt.keyword.Hadron"));
         try {
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
             protonMass = hadron_p.getMass();
             //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
-            SYMBOL_MAP.put(hadron_p,"p");
-            NAME_MAP.put(hadron_p,translateToLocal("tt.keyword.Proton"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p);
+            SYMBOL_MAP.put(hadron_p, "p");
+            UNLOCALIZED_NAME_MAP.put(hadron_p, "tt.keyword.Proton");
+            registry.registerForDisplay(hadron_p);
+            registry.registerDirectDefinition("p",hadron_p);
+
             hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
-            SYMBOL_MAP.put(hadron_p_,"~p");
-            NAME_MAP.put(hadron_p_,translateToLocal("tt.keyword.AntiProton"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p_);
+            SYMBOL_MAP.put(hadron_p_, "~p");
+            UNLOCALIZED_NAME_MAP.put(hadron_p_, "tt.keyword.AntiProton");
+            registry.registerForDisplay(hadron_p_);
+            registry.registerDirectDefinition("~p",hadron_p_);
+
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.getMass();
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
-            NAME_MAP.put(hadron_n,translateToLocal("tt.keyword.Neutron"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n);
+            UNLOCALIZED_NAME_MAP.put(hadron_n, "tt.keyword.Neutron");
+            registry.registerForDisplay(hadron_n);
+            registry.registerDirectDefinition("n",hadron_n);
+
             hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
-            SYMBOL_MAP.put(hadron_n_,"~n");
-            NAME_MAP.put(hadron_n_,translateToLocal("tt.keyword.AntiNeutron"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n_);
+            SYMBOL_MAP.put(hadron_n_, "~n");
+            UNLOCALIZED_NAME_MAP.put(hadron_n_, "tt.keyword.AntiNeutron");
+            registry.registerForDisplay(hadron_n_);
+            registry.registerDirectDefinition("~n",hadron_n_);
+
+            TecTech.LOGGER.info("Old Neutron Mass: " + neutronMass);
+            TecTech.LOGGER.info("Old Proton Mass: " + protonMass);
+            TecTech.LOGGER.info("New Neutron Mass: " + EMHadronDefinition.hadron_n.getMass());
+            TecTech.LOGGER.info("New Proton Mass: " + EMHadronDefinition.hadron_p.getMass());
         } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -446,34 +428,29 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         hadron_n3 = new EMDefinitionStack(hadron_n, 3D);
         hadron_p5 = new EMDefinitionStack(hadron_p, 5D);
 
-        try {
-            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMHadronDefinition::fromNBT,EMHadronDefinition.class,getClassTypeStatic());
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
+        if (DEBUG_MODE) {
             TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
-    public static void setTransformations(){
+    public static void setTransformations(EMTransformationRegistry transformationInfo) {//Todo use Neutronium atom?
         //Added to atom map, but should be in its own
-        EMDefinitionStack neutrons =new EMDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
-        TRANSFORMATION_INFO.getOredictDequantization().put(neutrons.getDefinition(),new EMOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
-        TRANSFORMATION_INFO.getOredictQuantization().put(
-                OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
-                new EMOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
+        EMDefinitionStack neutrons = new EMDefinitionStack(hadron_n, 1000 * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED);
+        EMDequantizationInfo emDequantizationInfo = new EMDequantizationInfo(neutrons);
+        emDequantizationInfo.setOre(new OreDictionaryStack(1,OreDictionary.getOreID(OrePrefixes.dust.name() + Materials.Neutronium.mName)));//todo shitty looking, but works...
+        transformationInfo.getInfoMap().put(neutrons.getDefinition(), emDequantizationInfo);
+        transformationInfo.getOredictQuantization().put(
+                OreDictionary.getOreID(OrePrefixes.ingotHot.name() + Materials.Neutronium.mName),
+                new EMOredictQuantizationInfo(OrePrefixes.ingotHot, Materials.Neutronium, 1, neutrons)
         );
     }
 
     @Override
-    public byte getClassType() {
+    public int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic(){
+    public static int getClassTypeStatic() {
         return -64;
     }
 
@@ -484,32 +461,32 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
+        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getSimpleName());
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = " + getSimpleName());
             //lines.add("SYMBOL = "+getSymbol());
         }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
         }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("HALF LIFE = " + getRawTimeSpan(energyLevel) + " s");
+            lines.add("    " + "At current energy level");
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index f20f872a6e..9b77a6cab8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -1,46 +1,16 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class EMBosonDefinition extends EMPrimitiveTemplate {
-    public static final EMBosonDefinition
-            boson_Y__ = new EMBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
-            boson_H__ = new EMBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
-    //deadEnd
-    public static final EMDecay                   deadEnd     = new EMDecay(boson_Y__, boson_Y__);
-    public static final EMDecay           deadEndHalf = new EMDecay(boson_Y__);
-    public static final EMDefinitionStack boson_Y__1  =new EMDefinitionStack(boson_Y__,1);
-
-    private EMBosonDefinition(String name, String symbol, double mass, int color, int ID) {
-        super(name, symbol, 0, mass, 0, color, ID);
-    }
-
-    public static void run() {
-        boson_Y__.init(null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        boson_H__.init(null, 1.56e-22D, 2, 2,
-                new EMDecay(0.01D, quark_b, quark_b_),
-                new EMDecay(0.02D, lepton_t, lepton_t_),
-                new EMDecay(0.96D, new EMDefinitionStack(boson_Y__, 4)),
-                deadEnd);
+public abstract class EMBosonDefinition extends EMPrimitiveTemplate {
+    protected EMBosonDefinition(String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) {
+        super(name, symbol, generation, mass, charge, color, ID, bind);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Boson")+": " + getName();
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return this==boson_H__;
+        return translateToLocal("tt.keyword.Boson")+": " + translateToLocal(getUnlocalizedName());
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
new file mode 100644
index 0000000000..f8f05b80ee
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
@@ -0,0 +1,16 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+public abstract class EMFermionDefinition extends EMPrimitiveTemplate {
+    protected EMFermionDefinition(String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) {
+        super(name, symbol, generation, mass, charge, color, ID, bind);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.Fermion")+": " + translateToLocal(getUnlocalizedName());
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
new file mode 100644
index 0000000000..fb8128c3a5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
@@ -0,0 +1,83 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public class EMGaugeBosonDefinition extends EMBosonDefinition {
+    public static final EMGaugeBosonDefinition
+            boson_g__ = new EMGaugeBosonDefinition("tt.keyword.Gluon", "g", 0, 0, 8, 27, "g"),
+            boson_Y__ = new EMGaugeBosonDefinition("tt.keyword.Photon", "\u03b3", 1e-18D, 0, -1, 28, "Y"),
+            boson_Z   = new EMGaugeBosonDefinition("tt.keyword.Weak0", "Z0", 91.1876e9, 0, -1, 29, "Z0"),
+            boson_W_  = new EMGaugeBosonDefinition("tt.keyword.WeakPlus", "W+", 80.379e9, 3, -1, 30, "W+"),
+            boson_W   = new EMGaugeBosonDefinition("tt.keyword.WeakMinus", "W-", 80.379e9, -3, -1, 31, "W-");
+    //deadEnd
+    public static final EMDecay           deadEnd     = new EMDecay(boson_Y__, boson_Y__);
+    public static final EMDefinitionStack boson_Y__1  = new EMDefinitionStack(boson_Y__, 1);
+    public static final EMDecay           deadEndHalf = new EMDecay(boson_Y__1);
+
+    protected EMGaugeBosonDefinition(String name, String symbol, double mass, int charge, int color, int ID, String bind) {
+        super(name, symbol, 0, mass, charge, color, ID, bind);
+    }
+
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMGaugeBosonDefinition.class, "tt.keyword.GaugeBoson"));
+        boson_g__.init(registry, boson_g__, 3e-50, 0, 0, deadEndHalf);
+        boson_Y__.init(registry, boson_Y__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        boson_Z.init(registry, boson_Z, 3e-25, 11, 11,
+                new EMDecay(0.03363, lepton_e, lepton_e_),
+                new EMDecay(0.03366, lepton_m, lepton_m_),
+                new EMDecay(0.03367, lepton_t, lepton_t_),
+                new EMDecay(0.068333, lepton_Ve, lepton_Ve_),
+                new EMDecay(0.068333, lepton_Vm, lepton_Vm_),
+                new EMDecay(0.068333, lepton_Vt, lepton_Vt_),
+                new EMDecay(0.118, quark_u, quark_u_),
+                new EMDecay(0.118, quark_c, quark_c_),
+                new EMDecay(0.152, quark_d, quark_d_),
+                new EMDecay(0.152, quark_s, quark_s_),
+                new EMDecay(0.152, quark_b, quark_b_),
+                deadEnd);
+        boson_W.init(registry, boson_W_, 3e-25, 9, 9,
+                new EMDecay(0.108, lepton_e, lepton_Ve_),
+                new EMDecay(0.108, lepton_m, lepton_Vm_),
+                new EMDecay(0.108, lepton_t, lepton_Vt_),
+                new EMDecay(0.112666, quark_u_, quark_d),
+                new EMDecay(0.112666, quark_u_, quark_s),
+                new EMDecay(0.112666, quark_u_, quark_b),
+                new EMDecay(0.112666, quark_c_, quark_d),
+                new EMDecay(0.112666, quark_c_, quark_s),
+                new EMDecay(0.112666, quark_c_, quark_b),
+                deadEnd);
+        boson_W_.init(registry, boson_W, 3e-25, 9, 9,
+                new EMDecay(0.108, lepton_e_, lepton_Ve),
+                new EMDecay(0.108, lepton_m_, lepton_Vm),
+                new EMDecay(0.108, lepton_t_, lepton_Vt),
+                new EMDecay(0.112666, quark_u, quark_d_),
+                new EMDecay(0.112666, quark_u, quark_s_),
+                new EMDecay(0.112666, quark_u, quark_b_),
+                new EMDecay(0.112666, quark_c, quark_d_),
+                new EMDecay(0.112666, quark_c, quark_s_),
+                new EMDecay(0.112666, quark_c, quark_b_),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.GaugeBoson") + ": " + translateToLocal(getUnlocalizedName());
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index 38e537ec59..c665bf23b4 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -1,57 +1,60 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMScalarBosonDefinition.boson_H__;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMLeptonDefinition extends EMPrimitiveTemplate {
+public class EMLeptonDefinition extends EMFermionDefinition {
     public static final EMLeptonDefinition
-            lepton_e = new EMLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
-            lepton_m = new EMLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
-            lepton_t = new EMLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19),
-            lepton_e_ = new EMLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6D, 3, 16),
-            lepton_m_ = new EMLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18),
-            lepton_t_ = new EMLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20);
+            lepton_e = new EMLeptonDefinition("tt.keyword.Electron", "\u03b2-", 1, 0.511e6D, -3, 15,"e-"),
+            lepton_m = new EMLeptonDefinition("tt.keyword.Muon", "\u03bc-", 2, 105.658e6D, -3, 17,"m-"),
+            lepton_t = new EMLeptonDefinition("tt.keyword.Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19,"t-"),
+            lepton_e_ = new EMLeptonDefinition("tt.keyword.Positron", "\u03b2+", -1, 0.511e6D, 3, 16,"e+"),
+            lepton_m_ = new EMLeptonDefinition("tt.keyword.Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18,"m+"),
+            lepton_t_ = new EMLeptonDefinition("tt.keyword.Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20,"t+");
 
     public static final EMDefinitionStack lepton_e1  = new EMDefinitionStack(lepton_e, 1);
     public static final EMDefinitionStack lepton_e2  = new EMDefinitionStack(lepton_e, 2);
     public static final EMDefinitionStack lepton_e_1 = new EMDefinitionStack(lepton_e_, 1);
     public static final EMDefinitionStack lepton_e_2 = new EMDefinitionStack(lepton_e_, 2);
 
-    private EMLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, -1, ID);
+    protected EMLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID,String bind) {
+        super(name, symbol, type, mass, charge, -1, ID,bind);
         //this.itemThing=null;
         //this.fluidThing=null;
     }
 
-    public static void run() {
-        lepton_e.init(lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMLeptonDefinition.class,"tt.keyword.Lepton"));
+        lepton_e.init(registry,lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
                 deadEnd,
                 new EMDecay(lepton_e,boson_Y__));
-        lepton_m.init(lepton_m_, 2.197019e-6D, 0, 1,
+        lepton_m.init(registry,lepton_m_, 2.197019e-6D, 0, 1,
                 new EMDecay(0.9D, lepton_e, lepton_Ve_, lepton_Vm),
                 deadEnd);//makes photons and don't care
-        lepton_t.init(lepton_t_, 2.906e-13D, 1, 3,
+        lepton_t.init(registry,lepton_t_, 2.903e-13D, 1, 3,
                 new EMDecay(0.05F, lepton_m, lepton_Vm_, lepton_Vt, boson_H__),
                 new EMDecay(0.1D, lepton_e, lepton_Ve_, lepton_Vm),
                 new EMDecay(0.8D, lepton_m, lepton_Vm_, lepton_Vt, boson_Y__),
                 deadEnd);//makes photons and don't care
 
-        lepton_e_.init(lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
+        lepton_e_.init(registry,lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
                 deadEnd,
                 new EMDecay(lepton_e,boson_Y__));
-        lepton_m_.init(lepton_m, 2.197019e-6F, 0, 1,
+        lepton_m_.init(registry,lepton_m, 2.197019e-6F, 0, 1,
                 new EMDecay(0.9F, lepton_e_, lepton_Ve, lepton_Vm_),
                 deadEnd);//makes photons and don't care
-        lepton_t_.init(lepton_t, 2.906e-13F, 1, 3,
+        lepton_t_.init(registry,lepton_t, 2.903e-13F, 1, 3,
                 new EMDecay(0.05F, lepton_m_, lepton_Vm, lepton_Vt_, boson_H__),
                 new EMDecay(0.1F, lepton_e_, lepton_Ve, lepton_Vm_),
                 new EMDecay(0.8F, lepton_m_, lepton_Vm, lepton_Vt_, boson_Y__),
@@ -60,7 +63,7 @@ public final class EMLeptonDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Lepton")+": " + getName();
+        return translateToLocal("tt.keyword.Lepton")+": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index 9af7b97cb4..9ef04e8c7e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -1,56 +1,59 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEndHalf;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMNeutrinoDefinition extends EMPrimitiveTemplate {
+public class EMNeutrinoDefinition extends EMLeptonDefinition {
     public static final EMNeutrinoDefinition
-            lepton_Ve = new EMNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
-            lepton_Vm = new EMNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
-            lepton_Vt = new EMNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6D, 25),
-            lepton_Ve_ = new EMNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0D, 22),
-            lepton_Vm_ = new EMNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24),
-            lepton_Vt_ = new EMNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6D, 26);
+            lepton_Ve = new EMNeutrinoDefinition("tt.keyword.ElectronNeutrino", "\u03bd\u03b2", 1, 2e0D, 21,"Ve-"),
+            lepton_Vm = new EMNeutrinoDefinition("tt.keyword.MuonNeutrino", "\u03bd\u03bc", 2, 0.15e6D, 23,"Vm-"),
+            lepton_Vt = new EMNeutrinoDefinition("tt.keyword.TauonNeutrino", "\u03bd\u03c4", 3, 15e6D, 25,"Vt-"),
+            lepton_Ve_ = new EMNeutrinoDefinition("tt.keyword.PositronNeutrino", "~\u03bd\u03b2", -1, 2e0D, 22,"Ve+"),
+            lepton_Vm_ = new EMNeutrinoDefinition("tt.keyword.AntimuonNeutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24,"Vm+"),
+            lepton_Vt_ = new EMNeutrinoDefinition("tt.keyword.AntitauonNeutrino", "~\u03bd\u03c4", -3, 15e6D, 26,"Vt+");
 
     public static final EMDefinitionStack lepton_Ve1  = new EMDefinitionStack(lepton_Ve, 1);
     public static final EMDefinitionStack lepton_Ve2  = new EMDefinitionStack(lepton_Ve, 2);
     public static final EMDefinitionStack lepton_Ve_1 = new EMDefinitionStack(lepton_Ve_, 1);
     public static final EMDefinitionStack lepton_Ve_2 = new EMDefinitionStack(lepton_Ve_, 2);
 
-    private EMNeutrinoDefinition(String name, String symbol, int type, double mass, int ID) {
-        super(name, symbol, type, mass, 0, -1, ID);
+    protected EMNeutrinoDefinition(String name, String symbol, int type, double mass, int ID,String bind) {
+        super(name, symbol, type, mass, 0, ID,bind);
     }
 
-    public static void run() {
-        lepton_Ve.init(lepton_Ve_, 1D, -1, -1,
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMNeutrinoDefinition.class,"tt.keyword.Neutrino"));
+        lepton_Ve.init(registry,lepton_Ve_, 1D, -1, -1,
                 EMDecay.NO_PRODUCT);
-        lepton_Vm.init(lepton_Vm_, 1D, 1, 0,
+        lepton_Vm.init(registry,lepton_Vm_, 1D, 1, 0,
                 new EMDecay(0.825D, nothing),
                 deadEndHalf);
-        lepton_Vt.init(lepton_Vt_, 1, 1, 0,
+        lepton_Vt.init(registry,lepton_Vt_, 1, 1, 0,
                 new EMDecay(0.75F, nothing),
                 deadEnd);
 
-        lepton_Ve_.init(lepton_Ve, 1, -1, -1,
+        lepton_Ve_.init(registry,lepton_Ve, 1, -1, -1,
                 EMDecay.NO_PRODUCT);
-        lepton_Vm_.init(lepton_Vm, 1, 1, 0,
+        lepton_Vm_.init(registry,lepton_Vm, 1, 1, 0,
                 new EMDecay(0.825F, nothing),
                 deadEndHalf);
-        lepton_Vt_.init(lepton_Vt, 1, 1, 0,
+        lepton_Vt_.init(registry,lepton_Vt, 1, 1, 0,
                 new EMDecay(0.75F, nothing),
                 deadEnd);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Neutrino")+": " + getName();
+        return translateToLocal("tt.keyword.Neutrino")+": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index 41da06567d..60f87ac83b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -1,6 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -8,29 +10,45 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMPrimitiveDefinition extends EMPrimitiveTemplate {
+public class EMPrimitiveDefinition extends EMPrimitiveTemplate {
     public static final EMPrimitiveDefinition
-            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, 0),
-            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MIN_VALUE),
-            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, Integer.MIN_VALUE+1),
-            magic = new EMPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
-            magic_ = new EMPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
-
-    private EMPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID) {
-        super(name, symbol, type, mass, 0, color, ID);
+           nbtE__  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveNBTERROR"    , "!"   , 0  , 0D   , -1 , Integer.MIN_VALUE     , "!"    ),
+           null__  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveNULLPOINTER" , "."   , 0  , 0D   , -3 , Integer.MIN_VALUE+1   , "."    ),
+           space   = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveSpace"       , "_"   , 0  , 0D   , -4 , Integer.MIN_VALUE + 2 , "_"    ),
+           space_   = new EMPrimitiveDefinition ( "tt.keyword.PrimitivePresence"    , "~_"  , 0  , 0D   , -4 , Integer.MIN_VALUE + 3 , "~_"   ),
+           mass    = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveMass"        , "#"   , 0  , 1    , -4 , Integer.MIN_VALUE + 4 , "#"    ),
+           mass_   = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveDarkMass"    , "~#"  , 0  , 1    , -4 , Integer.MIN_VALUE + 5 , "~#"   ),
+           energy  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveEnergy"      , "E"   , 4  , 0D   , -4 , Integer.MIN_VALUE + 6 , "E"    ),
+           energy_ = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveDarkEnergy"  , "~E"  , -4 , 0    , -4 , Integer.MIN_VALUE + 7 , "~E"   ),
+           magic   = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveMagic"       , "Ma"  , 5  , 1e5D , 0  , Integer.MIN_VALUE + 8 , "Ma"   ),
+           magic_  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveAntimagic"   , "~Ma" , -5 , 1e5D , 0  , Integer.MIN_VALUE + 9 , "~Ma"  );
+
+
+    protected EMPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID, String bind) {
+        super(name, symbol, type, mass, 0, color, ID, bind);
     }
 
-    public static void run() {
-        nbtE__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        null__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        space__.init(space__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        magic.init(magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        magic_.init(magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMPrimitiveDefinition.class, "tt.keyword.Primitive"));
+        nbtE__.init(registry, null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        null__.init(registry, null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        space.init(registry, space_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        space_.init(registry, space, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        mass.init(registry, mass_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        mass_.init(registry, mass, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        energy.init(registry, energy_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        energy_.init(registry, energy, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        magic.init(registry, magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        magic_.init(registry, magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Primitive")+": " + getName();
+        return translateToLocal("tt.keyword.Primitive") + ": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index 3f19205aeb..19162bf90d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -1,8 +1,10 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -10,94 +12,95 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMQuarkDefinition extends EMPrimitiveTemplate {
+public class EMQuarkDefinition extends EMFermionDefinition {
     public static final EMQuarkDefinition
-            quark_u = new EMQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
-            quark_c = new EMQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
-            quark_t = new EMQuarkDefinition("Top", "t", 3, 172.44e9D, 2, 13),
-            quark_d = new EMQuarkDefinition("Down", "d", 1, 4.8e6D, -1, 5),
-            quark_s = new EMQuarkDefinition("Strange", "s", 2, 95e6D, -1, 7),
-            quark_b = new EMQuarkDefinition("Bottom", "b", 3, 4.65e9D, -1, 11),
-            quark_u_ = new EMQuarkDefinition("AntiUp", "~u", -1, 2.3e6D, -2, 4),
-            quark_c_ = new EMQuarkDefinition("AntiCharm", "~c", -2, 1.29e9D, -2, 10),
-            quark_t_ = new EMQuarkDefinition("AntiTop", "~t", -3, 172.44e9D, -2, 14),
-            quark_d_ = new EMQuarkDefinition("AntiDown", "~d", -1, 4.8e6D, 1, 6),
-            quark_s_ = new EMQuarkDefinition("AntiStrange", "~s", -2, 95e6D, 1, 8),
-            quark_b_ = new EMQuarkDefinition("AntiBottom", "~b", -3, 4.65e9D, 1, 12);
+            quark_u = new EMQuarkDefinition("tt.keyword.QuarkUp", "u", 1, 2.3e6D, 2, 3,"u"),
+            quark_c = new EMQuarkDefinition("tt.keyword.QuarkCharm", "c", 2, 1.29e9D, 2, 9,"c"),
+            quark_t = new EMQuarkDefinition("tt.keyword.QuarkTop", "t", 3, 172.44e9D, 2, 13,"t"),
+            quark_d = new EMQuarkDefinition("tt.keyword.QuarkDown", "d", 1, 4.8e6D, -1, 5,"d"),
+            quark_s = new EMQuarkDefinition("tt.keyword.QuarkStrange", "s", 2, 95e6D, -1, 7,"s"),
+            quark_b = new EMQuarkDefinition("tt.keyword.QuarkBottom", "b", 3, 4.65e9D, -1, 11,"b"),
+            quark_u_ = new EMQuarkDefinition("tt.keyword.QuarkAntiUp", "~u", -1, 2.3e6D, -2, 4,"~u"),
+            quark_c_ = new EMQuarkDefinition("tt.keyword.QuarkAntiCharm", "~c", -2, 1.29e9D, -2, 10,"~c"),
+            quark_t_ = new EMQuarkDefinition("tt.keyword.QuarkAntiTop", "~t", -3, 172.44e9D, -2, 14,"~t"),
+            quark_d_ = new EMQuarkDefinition("tt.keyword.QuarkAntiDown", "~d", -1, 4.8e6D, 1, 6,"~d"),
+            quark_s_ = new EMQuarkDefinition("tt.keyword.QuarkAntiStrange", "~s", -2, 95e6D, 1, 8,"~s"),
+            quark_b_ = new EMQuarkDefinition("tt.keyword.QuarkAntiBottom", "~b", -3, 4.65e9D, 1, 12,"~b");
 
-    private EMQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, 0, ID);
+    protected EMQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID,String bind) {
+        super(name, symbol, type, mass, charge, 0, ID,bind);
     }
 
-    public static void run() {
-        quark_u.init(quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMQuarkDefinition.class,"tt.keyword.Quark"));
+        quark_u.init(registry,quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(1.23201e-5D, quark_b/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.050778116D, quark_s/*,lepton_m_,lepton_Vm*/),
                 new EMDecay(0.9D, quark_d, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c.init(quark_c_, 0.5e-13D, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_c.init(registry,quark_c_, 0.5e-13D, 1, -1,
                 new EMDecay(0.00169744D, quark_b/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.05071504D, quark_d, lepton_m_, lepton_Vm),
                 new EMDecay(0.9D, quark_s, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t.init(quark_t_, 2.5e-26D, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_t.init(registry,quark_t_, 2.5e-26D, 0, -1,
                 new EMDecay(7.51689e-5D, quark_d, lepton_t_, lepton_Vt),
                 new EMDecay(0.00163216D, quark_s, lepton_m_, lepton_Vm),
                 new EMDecay(0.9D, quark_b, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
 
-        quark_d.init(quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
+        quark_d.init(registry,quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(7.51689e-5D, quark_t/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.05071504D, quark_c/*,lepton_m,lepton_Vm_*/),
                 new EMDecay(0.9D, quark_u, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s.init(quark_s_, 0.6e-9D, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_s.init(registry,quark_s_, 0.6e-9D, 1, -1,
                 new EMDecay(0.00163216D, quark_t/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.050778116D, quark_u, lepton_m, lepton_Vm_),
                 new EMDecay(0.9D, quark_c, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b.init(quark_b_, 0.7e-13D, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_b.init(registry,quark_b_, 0.7e-13D, 0, -1,
                 new EMDecay(1.23201e-5D, quark_u, lepton_t, lepton_Vt_),
                 new EMDecay(0.00169744D, quark_c, lepton_m, lepton_Vm_),
                 new EMDecay(0.9D, quark_t, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
 
-        quark_u_.init(quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
+        quark_u_.init(registry,quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(1.23201e-5D, quark_b_/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.050778116D, quark_s_/*,lepton_m,lepton_Vm_*/),
                 new EMDecay(0.9D, quark_d_, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c_.init(quark_c, 0.5e-13D, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_c_.init(registry,quark_c, 0.5e-13D, 1, -1,
                 new EMDecay(0.00169744F, quark_b_/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.05071504F, quark_d_, lepton_m, lepton_Vm_),
                 new EMDecay(0.9F, quark_s_, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t_.init(quark_t, 2.5e-26F, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_t_.init(registry,quark_t, 2.5e-26F, 0, -1,
                 new EMDecay(7.51689e-5F, quark_d_, lepton_t, lepton_Vt_),
                 new EMDecay(0.00163216F, quark_s_, lepton_m, lepton_Vm_),
                 new EMDecay(0.9F, quark_b_, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
 
-        quark_d_.init(quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
+        quark_d_.init(registry,quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(7.51689e-5F, quark_t_/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.05071504F, quark_c_/*,lepton_m_,lepton_Vm*/),
                 new EMDecay(0.9F, quark_u_, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s_.init(quark_s, 0.6e-9F, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_s_.init(registry,quark_s, 0.6e-9F, 1, -1,
                 new EMDecay(0.00163216F, quark_t_/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.050778116F, quark_u_, lepton_m_, lepton_Vm),
                 new EMDecay(0.9F, quark_c_, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b_.init(quark_b, 0.7e-13F, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_b_.init(registry,quark_b, 0.7e-13F, 0, -1,
                 new EMDecay(1.23201e-5F, quark_u_, lepton_t_, lepton_Vt),
                 new EMDecay(0.00169744F, quark_c_, lepton_m_, lepton_Vm),
                 new EMDecay(0.9F, quark_t_, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Quark")+": " + getName();
+        return translateToLocal("tt.keyword.Quark")+": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
new file mode 100644
index 0000000000..5070954847
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
@@ -0,0 +1,46 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public class EMScalarBosonDefinition extends EMBosonDefinition {
+    public static final EMScalarBosonDefinition
+            boson_H__ = new EMScalarBosonDefinition("tt.keyword.Higgs", "H0", 125.09e9D, -2, 32,"H0");
+
+    private EMScalarBosonDefinition(String name, String symbol, double mass, int color, int ID,String bind) {
+        super(name, symbol, 0, mass, 0, color, ID,bind);
+    }
+
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMScalarBosonDefinition.class,"tt.keyword.ScalarBoson"));
+        boson_H__.init(registry,boson_H__, 1.56e-22D, 8, 8,
+                new EMDecay ( 0.0002171 , lepton_m   , lepton_m_  ),
+                new EMDecay ( 0.001541  , boson_Z, boson_Y__  ),
+                new EMDecay ( 0.02641   , boson_Z, boson_Z),
+                new EMDecay ( 0.02884   , quark_c    , quark_c_   ),
+                new EMDecay ( 0.06256   , lepton_t   , lepton_t_  ),
+                new EMDecay ( 0.0818    , boson_g__  , boson_g__  ),
+                new EMDecay ( 0.2152    , boson_W_, boson_W),
+                new EMDecay ( 0.5809    , quark_b    , quark_b_   ),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.ScalarBoson")+": " + translateToLocal(getUnlocalizedName());
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index b7310485a2..68607ae737 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,11 +1,10 @@
 package com.github.technus.tectech.recipe;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.item.ItemStack;
@@ -16,8 +15,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-
 public class TT_recipe extends GT_Recipe {
     public static final String        E_RECIPE_ID = "eRecipeID";
     public final EMConstantStackMap[]             input;
@@ -257,20 +254,6 @@ public class TT_recipe extends GT_Recipe {
             return mRecipeMap.get(stack);
         }
 
-        public T findRecipe(ItemStack dataHandler){
-            if(dataHandler==null || dataHandler.stackTagCompound==null) {
-                return null;
-            }
-            try {
-                return mRecipeMap.get(EMDefinitionsRegistry.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
-            }catch (Exception e){
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return null;
-            }
-        }
-
         public void add(T recipe){
             mRecipeMap.put(recipe.mResearchEM,recipe);
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
index d34d12c754..42fb14f55d 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
@@ -13,7 +13,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 17.12.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
index bac2dfb9ac..2a8bb37a0b 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
@@ -10,7 +10,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static com.github.technus.tectech.thing.metaTileEntity.Textures.*;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
index eb590ab2e2..f3574007f2 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
@@ -18,7 +18,7 @@ import net.minecraft.world.IBlockAccess;
 import java.util.List;
 
 import static com.github.technus.tectech.TecTech.tectechTexturePage1;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 03.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
index c65870eeb7..9648e41d8d 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
@@ -16,7 +16,7 @@ import net.minecraft.world.IBlockAccess;
 
 import java.util.List;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 03.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
index 90f3312342..cc071d2326 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
@@ -28,7 +28,7 @@ import java.io.OutputStream;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 @Optional.InterfaceList(
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
index 752f2d1bcc..3d00fcdf35 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
@@ -12,7 +12,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index 2062173cfd..d909054196 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -1,15 +1,15 @@
 package com.github.technus.tectech.thing.item;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
-import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
+import com.github.technus.tectech.util.CommonValues;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -30,8 +30,8 @@ import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -61,7 +61,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
                     EMInstanceStackMap content = ((IEMContainer) metaTE).getContentHandler();
                     if (tNBT.hasKey("content")) {
                         try {
-                            content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+                            content.putUnifyAll(EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content")));
                         } catch (EMException e) {
                             if (DEBUG_MODE) {
                                 e.printStackTrace();
@@ -75,7 +75,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
                     } else if (content.hasStacks()) {
                         ((IEMContainer) metaTE).purgeOverflow();
                         tNBT.setTag("info", content.getInfoNBT());
-                        tNBT.setTag("content", content.toNBT());
+                        tNBT.setTag("content", content.toNBT(TecTech.definitionsRegistry));
                         tNBT.setTag("symbols", content.getShortSymbolsNBT());
                         content.clear();
                     }
@@ -94,7 +94,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         }
         if (tNBT.hasKey("content")) {
             try {
-                content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+                content.putUnifyAll(EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content")));
             } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
@@ -106,7 +106,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
             tNBT.removeTag("symbols");
         } else if (content.hasStacks()) {
             tNBT.setTag("info", content.getInfoNBT());
-            tNBT.setTag("content", content.toNBT());
+            tNBT.setTag("content", content.toNBT(TecTech.definitionsRegistry));
             tNBT.setTag("symbols", content.getShortSymbolsNBT());
             content.clear();
         }
@@ -140,10 +140,10 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         ItemStack that = new ItemStack(this, 1);
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
-        for(IEMDefinition definition: EMDefinitionsRegistry.getStacksRegisteredForDisplay()){
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 144 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_144))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1000 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
+        for(IEMDefinition definition: TecTech.definitionsRegistry.getStacksRegisteredForDisplay()){
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.itemMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1000+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k))));
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index 2cca6474f4..f0f59e0e86 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.thing.item;
 
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
@@ -20,7 +21,7 @@ import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -48,7 +49,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
             EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= EMConstantStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content"));
                 } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
@@ -56,7 +57,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 }
             }
             tNBT.setTag("info", definitions.getInfoNBT());
-            tNBT.setTag("content", definitions.toNBT());
+            tNBT.setTag("content", definitions.toNBT(TecTech.definitionsRegistry));
             tNBT.setTag("symbols",definitions.getShortSymbolsNBT());
             return oldMap;
         }
@@ -71,7 +72,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 return null;
             }
             try {
-                return EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                return EMConstantStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content"));
             } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
@@ -91,7 +92,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
             EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= EMConstantStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content"));
                 } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index e517fe5f2a..8b8133a1e2 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java
index f4531a248b..4fca682268 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
index d71abb34b7..b74f40f336 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
@@ -12,7 +12,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
index 1d1da74a7a..7f9e0f0a4a 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
index 69ff06e9e7..bc853334d2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
@@ -193,7 +193,7 @@ public class Textures {
 
     public static ITexture TESLA_TRANSCEIVER_TOP_BA = new GT_RenderedTexture(TESLA_TRANSCEIVER_TOP);
 
-    public Textures(){
+    public static void run(){
         for (byte i = 0; i < MACHINE_CASINGS_TT.length; i++) {
             for (byte j = 0; j < MACHINE_CASINGS_TT[i].length; j++) {
                 MACHINE_CASINGS_TT[i][j] = new GT_SidedTexture(MACHINECASINGS_BOTTOM_TT[i], MACHINECASINGS_TOP_TT[i], MACHINECASINGS_SIDE_TT[i], Dyes.getModulation(j - 1, MACHINE_METAL.mRGBa));
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 0950a173ab..84f18ad2bf 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -24,7 +24,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 import static com.github.technus.tectech.util.CommonValues.*;
 import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
@@ -83,7 +83,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         //aNBT.setFloat("lifeTimeMult",lifeTimeMult);
         aNBT.setDouble("OverflowMatter", overflowMatter);
         content.cleanUp();
-        aNBT.setTag("eM_Stacks", content.toNBT());
+        aNBT.setTag("eM_Stacks", content.toNBT(TecTech.definitionsRegistry));
         aNBT.setShort("eID", id);
     }
 
@@ -95,7 +95,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         overflowMatter = aNBT.getFloat("overflowMatter")+aNBT.getDouble("OverflowMatter");
         id = aNBT.getShort("eID");
         try {
-            content = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eM_Stacks"));
+            content = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eM_Stacks"));
         } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -210,7 +210,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     public double getMaxStackSize() {
-        return mTier * (mTier - 7) * 64D * AVOGADRO_CONSTANT_144;
+        return mTier * (mTier - 7) * 64D * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
deleted file mode 100644
index 3015d024c7..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ /dev/null
@@ -1,717 +0,0 @@
-package com.github.technus.tectech.thing.metaTileEntity.multi;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
-import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
-import com.github.technus.tectech.util.CommonValues;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.HashMap;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
-import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
-import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
-import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
-import static com.github.technus.tectech.util.DoubleCount.add;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by danie_000 on 17.12.2016.
- */
-public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
-    //region variables
-    private static Textures.BlockIcons.CustomIcon ScreenOFF;
-    private static Textures.BlockIcons.CustomIcon ScreenON;
-    private static Textures.BlockIcons.CustomIcon ScreenON_Slave;
-    private static Textures.BlockIcons.CustomIcon ScreenOFF_Slave;
-
-    protected static final byte FUSE_MODE = 0, COLLIDE_MODE = 1;
-    private static double MASS_TO_EU_INSTANT;
-    private static int STARTUP_COST, KEEPUP_COST;
-
-    protected byte            eTier = 0;
-    protected EMInstanceStack stack;
-    private   long            plasmaEnergy;
-
-    protected boolean started = false;
-    //endregion
-
-    //region collision handlers
-    public static final HashMap<Integer, IColliderHandler> FUSE_HANDLERS = new HashMap<>();
-    public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
-
-    public interface IPrimitiveColliderHandler {
-        void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out);
-    }
-
-    public interface IColliderHandler extends IPrimitiveColliderHandler {
-        byte getRequiredTier();
-    }
-
-    static {
-        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | EMAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
-                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 1;
-            }
-        });
-        registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(EMPrimitiveTemplate.getClassTypeStatic());
-
-        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
-                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 2;
-            }
-        });
-        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 2;
-            }
-        });
-
-        registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAspectFuse(EMPrimitiveTemplate.getClassTypeStatic());
-
-        FUSE_HANDLERS.put((EMPrimitiveTemplate.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
-                if (collisionHandler != null) {
-                    collisionHandler.collide(in2, in1, out);
-                } else {
-                    out.putUnifyAll(in1, in2);
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 2;
-            }
-        });
-
-        PRIMITIVE_FUSE_HANDLERS.put(EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> {
-            try {
-                EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                defs.putUnifyExact(in1.getDefinition().getStackForm(1));
-                defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-                EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
-            } catch (Exception e) {
-                out.putUnifyAll(in1, in2);
-                return;
-            }
-            if (in1.getAmount() > in2.getAmount()) {
-                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-            } else if (in2.getAmount() > in1.getAmount()) {
-                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-            }
-        });
-        PRIMITIVE_FUSE_HANDLERS.put(EMPrimalAspectDefinition.class.getName() + '\0' + EMPrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
-            if (fuseAspects(in1, in2, out)) return;
-            if (in1.getAmount() > in2.getAmount()) {
-                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-            } else if (in2.getAmount() > in1.getAmount()) {
-                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-            }
-        });
-    }
-
-    private static boolean fuseAspects(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-        try {
-            EMDefinitionStackMap defs = new EMDefinitionStackMap();
-            defs.putUnifyExact(in1.getDefinition().getStackForm(1));
-            defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-            EMComplexAspectDefinition aspect = new EMComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-            out.putUnify(new EMInstanceStack(aspect, Math.min(in1.getAmount(), in2.getAmount())));
-        } catch (Exception e) {
-            out.putUnifyAll(in1, in2);
-            return true;
-        }
-        return false;
-    }
-
-    private static void registerSimpleAspectFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((EMComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                if (fuseAspects(in1, in2, out)) return;
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 1;
-            }
-        });
-    }
-
-    private static void registerSimpleAtomFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 1;
-            }
-        });
-    }
-    //endregion
-
-    //region parameters
-    protected Parameters.Group.ParameterIn mode;
-    private static final IStatusFunction<GT_MetaTileEntity_EM_collider> MODE_STATUS = (base_EM, p) -> {
-        if (base_EM.isMaster()) {
-            double mode = p.get();
-            if (mode == FUSE_MODE || mode == COLLIDE_MODE) {
-                return STATUS_OK;
-            } else if (mode > 1) {
-                return STATUS_TOO_HIGH;
-            } else if (mode < 0) {
-                return STATUS_TOO_LOW;
-            }
-            return STATUS_WRONG;
-        }
-        return STATUS_OK;
-    };
-    private static final INameFunction<GT_MetaTileEntity_EM_collider> MODE_NAME = (base_EM, p) -> {
-        if (base_EM.isMaster()) {
-            double mode = p.get();
-            if (mode == FUSE_MODE) {
-                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.0");//Mode: Fuse
-            } else if (mode == COLLIDE_MODE) {
-                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.1");//Mode: Collide
-            }
-            return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.2");//Mode: Undefined
-        }
-        return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.3");//Currently Slaves...
-    };
-    //endregion
-
-    //region structure
-    //use multi A energy inputs, use less power the longer it runs
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = StructureDefinition
-            .<GT_MetaTileEntity_EM_collider>builder()
-            .addShapeOldApi("main", new String[][]{
-                    {"I0A0A0", "I00000", "I0A0A0",},
-                    {"H0000000", "G001111100", "H0000000",},
-                    {"F22223332222", "F41155555114", "F22223332222",},
-                    {"E2000000000002", "E4155111115514", "E2000000000002",},
-                    {"D20000E00002", "D41511E11514", "D20000E00002",},
-                    {"C2000I0002", "C4151I1514", "C2000I0002",},
-                    {"B2000K0002", "B4151K1514", "B2000K0002",},
-                    {"B200M002", "A0151M1510", "B200M002",},
-                    {"A0200M0020", "A0151M1510", "A0200M0020",},
-                    {"0020O0200", "0151O1510", "0020O0200",},
-                    {"A030O030", "0151O1510", "A030O030",},
-                    {"0030O0300", "0151O1510", "0030O0300",},
-                    {"A030O030", "0151O1510", "A030O030",},
-                    {"0020O0200", "0151O1510", "0020O0200",},
-                    {"A0200M0020", "A0151M1510", "A0200M0020",},
-                    {"B200M002", "A0151M1510", "B200M002",},
-                    {"B2000K0002", "B4151K1514", "B2000K0002",},
-                    {"C2000I0002", "C4151I1514", "C2000I0002",},
-                    {"D200002&&&200002", "D415112&.&211514", "D200002&&&200002",},
-                    {"E20!!22222!!02", "E4155111115514", "E20!!22222!!02",},
-                    {"F2222#$#2222", "F41155555114", "F2222#$#2222",},
-            })
-            .addElement('0', ofBlock(sBlockCasingsTT, 4))
-            .addElement('1', ofBlock(sBlockCasingsTT, 7))
-            .addElement('2', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
-                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 5)))
-            .addElement('3', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('4', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
-                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 6)))
-            .addElement('5', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
-                    error(), ofBlock(sBlockCasingsTT, 8), ofBlock(sBlockCasingsTT, 9)))
-            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addClassicToMachineList,
-                    textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList,
-                    textureOffset + 4, 2, sBlockCasingsTT, 4))
-            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList,
-                    textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('#', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList,
-                    textureOffset + 4, 4, sBlockCasingsTT, 4))
-            .build();
-    private static final String[] description = new String[]{
-            EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"),//2 - Elemental Input Hatches or Molecular Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.2"),//3 - Elemental Output Hatches or Molecular Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction
-    };
-
-    @Override
-    public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
-    }
-
-    //endregion
-
-    public GT_MetaTileEntity_EM_collider(int aID, String aName, String aNameRegional) {
-        super(aID, aName, aNameRegional);
-    }
-
-    public GT_MetaTileEntity_EM_collider(String aName) {
-        super(aName);
-    }
-
-    public static void setValues(int heliumPlasmaValue) {
-        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07* AVOGADRO_CONSTANT);//mass diff
-        MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20;
-        STARTUP_COST = -heliumPlasmaValue * 10000;
-        KEEPUP_COST = -heliumPlasmaValue;
-    }
-
-    protected double fuse(GT_MetaTileEntity_EM_collider partner) {///CAN MAKE EU
-        if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            boolean check = stack.getDefinition().fusionMakesEnergy(stack.getEnergy()) &&
-                    partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
-
-            EMInstanceStack stack2  = partner.stack;
-            double          preMass = add(stack2.getMass(),stack.getMass());
-            //System.out.println("preMass = " + preMass);
-
-            EMInstanceStackMap map = new EMInstanceStackMap();
-            IColliderHandler   colliderHandler;
-            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            }
-            for (EMInstanceStack newStack : map.valuesToArray()) {
-                check &= newStack.getDefinition().fusionMakesEnergy(newStack.getEnergy());
-            }
-            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new EMInstanceStackMap[]{map};
-
-            partner.stack = stack = null;
-            //System.out.println("check = " + check);
-            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
-            return check ? preMass - map.getMass() : Math.min(preMass - map.getMass(), 0);
-        }
-        return 0;
-    }
-
-    protected double collide(GT_MetaTileEntity_EM_collider partner) {//DOES NOT MAKE EU!
-        if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            EMInstanceStack stack2  = partner.stack;
-            double          preMass = stack2.getMass() + stack.getMass();
-            //System.out.println("preMass = " + preMass);
-
-            EMInstanceStackMap map = new EMInstanceStackMap();
-            IColliderHandler   colliderHandler;
-            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            }
-            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new EMInstanceStackMap[]{map};
-
-            partner.stack = stack = null;
-            //System.out.println("check = " + check);
-            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
-            return Math.min(preMass - map.getMass(), 0);
-        }
-        return 0;
-    }
-
-    private boolean handleRecipe(EMInstanceStack stack2, EMInstanceStackMap map, IColliderHandler colliderHandler) {
-        if (colliderHandler != null && eTier >= colliderHandler.getRequiredTier()) {
-            colliderHandler.collide(stack2, stack, map);
-        } else {
-            map.putUnifyAll(stack, stack2);
-            outputEM = new EMInstanceStackMap[]{map};
-            return true;
-        }
-        return false;
-    }
-
-    protected GT_MetaTileEntity_EM_collider getPartner() {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
-        IGregTechTileEntity gregTechBaseTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir);
-        if (gregTechBaseTileEntity != null) {
-            IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity();
-            return gregTechMetaTileEntity instanceof GT_MetaTileEntity_EM_collider &&
-                    ((GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity).mMachine &&
-                    gregTechBaseTileEntity.getBackFacing() == iGregTechTileEntity.getFrontFacing() ?
-                    (GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity : null;
-        }
-        return null;
-    }
-
-    protected final boolean isMaster() {
-        return getBaseMetaTileEntity().getFrontFacing() % 2 == 0;
-    }
-
-    private void makeEU(double massDiff) {
-        plasmaEnergy += massDiff * MASS_TO_EU_INSTANT;
-        if (DEBUG_MODE) {
-            System.out.println("plasmaEnergy = " + plasmaEnergy);
-        }
-    }
-
-    private EMInstanceStackMap tickStack() {
-        if (stack == null) {
-            return null;
-        }
-        stack.setAge(stack.getAge() + 1);
-        EMDecayResult newInstances = stack.decay(1, stack.getAge(), 0);
-        if (newInstances == null) {
-            stack.nextColor();
-            return null;
-        } else {
-            stack = newInstances.getOutput().removeKey(newInstances.getOutput().getLast().getDefinition());
-            return newInstances.getOutput();
-        }
-    }
-
-    @Override
-    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_EM_collider(mName);
-    }
-
-    @Override
-    public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 2;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 2;
-        if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir) != sBlockCasingsTT) {
-            eTier = 0;
-            return false;
-        }
-
-        if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 8) {
-            eTier = 1;
-        } else if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 9) {
-            eTier = 2;
-        } else {
-            eTier = 0;
-            return false;
-        }
-        if (structureCheck_EM("main", 11, 1, 18)) {
-            return true;
-        }
-        eTier = 0;
-        return false;
-    }
-
-    @Override
-    public boolean checkRecipe_EM(ItemStack itemStack) {
-        GT_MetaTileEntity_EM_collider partner = getPartner();
-        if (partner == null) {
-            return false;
-        }
-        mEfficiencyIncrease = 10000;
-        if (started) {
-            if (stack == null) {
-                for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
-                    EMInstanceStackMap container = inputElemental.getContentHandler();
-                    if (container.isEmpty()) {
-                        continue;
-                    }
-                    stack = container.removeKey(container.getFirst().getDefinition());
-                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / EMAtomDefinition.getSomethingHeavy().getMass())) / 2;
-                    if (eut < Integer.MIN_VALUE + 7) {
-                        return false;
-                    }
-                    mMaxProgresstime = 20;
-                    mEUt = (int) eut;
-                    eAmpereFlow = 5;
-                    return true;
-                }
-                mMaxProgresstime = 20;
-                mEUt = KEEPUP_COST;
-                eAmpereFlow = 1;
-                return true;
-            }
-            mMaxProgresstime = 20;
-            mEUt = KEEPUP_COST;
-            eAmpereFlow = 2;
-        } else {
-            started = true;
-            mMaxProgresstime = 20;
-            mEUt = STARTUP_COST;
-            eAmpereFlow = 10;
-        }
-        return true;
-    }
-
-    @Override
-    public void outputAfterRecipe_EM() {
-        GT_MetaTileEntity_EM_collider partner = getPartner();
-        if (partner == null) {
-            if (stack != null) {
-                cleanMassEM_EM(stack.getMass());
-                stack = null;
-            }
-            return;
-        }
-        if (isMaster()) {
-            switch ((int) mode.get()) {
-                case FUSE_MODE:
-                    makeEU(fuse(partner));
-                    break;
-                case COLLIDE_MODE:
-                    collide(partner);//todo
-                    break;
-                default: {
-                    outputEM = new EMInstanceStackMap[2];
-                    outputEM[1] = tickStack();
-                    if (outputEM[1] == null) {
-                        outputEM[1] = partner.tickStack();
-                    } else {
-                        EMInstanceStackMap map = partner.tickStack();
-                        if (map != null) {
-                            outputEM[1].putUnifyAll(map);
-                        }
-                    }
-                }
-            }
-            if (outputEM != null) {
-                for (int i = 0, lim = Math.min(outputEM.length, eOutputHatches.size()); i < lim; i++) {
-                    if (outputEM[i] != null) {
-                        eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
-                        outputEM[i] = null;
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public String[] getDescription() {
-        return new String[]{
-                CommonValues.TEC_MARK_EM,
-                translateToLocal("gt.blockmachines.multimachine.em.collider.desc.0"),//Collide matter at extreme velocities.
-                EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.collider.desc.1")//Faster than light*!!!
-        };
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister aBlockIconRegister) {
-        ScreenOFF = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER");
-        ScreenON = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE");
-        ScreenOFF_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_SLAVE");
-        ScreenON_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE_SLAVE");
-        super.registerIcons(aBlockIconRegister);
-    }
-
-    @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing) {
-            if (aFacing % 2 == 0) {
-                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF)};
-            } else {
-                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON_Slave : ScreenOFF_Slave)};
-            }
-        }
-        return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4]};
-    }
-
-    @Override
-    protected void parametersInstantiation_EM() {
-        Parameters.Group hatch_0 = parametrization.getGroup(0);
-        mode = hatch_0.makeInParameter(0, FUSE_MODE, MODE_NAME, MODE_STATUS);
-    }
-
-    @Override
-    public void parametersStatusesWrite_EM(boolean machineBusy) {
-        if (isMaster()) {
-            super.parametersStatusesWrite_EM(machineBusy);
-        }
-    }
-
-    @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        super.saveNBTData(aNBT);
-        aNBT.setByte("eTier", eTier);//collider tier
-        aNBT.setBoolean("eStarted", started);
-        if (stack != null) {
-            aNBT.setTag("eStack", stack.toNBT());
-        }
-        aNBT.setLong("ePlasmaEnergy", plasmaEnergy);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound aNBT) {
-        super.loadNBTData(aNBT);
-        eTier = aNBT.getByte("eTier");//collider tier
-        started = aNBT.getBoolean("eStarted");
-        if (aNBT.hasKey("eStack")) {
-            stack = EMInstanceStack.fromNBT(aNBT.getCompoundTag("eStack"));
-        }
-        plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
-    }
-
-    @Override
-    public void stopMachine() {
-        started = false;
-        if (stack != null) {
-            cleanMassEM_EM(stack.getMass());
-            stack = null;
-        }
-        super.stopMachine();
-    }
-
-    @Override
-    protected void afterRecipeCheckFailed() {
-        started = false;
-        if (stack != null) {
-            cleanMassEM_EM(stack.getMass());
-            stack = null;
-        }
-        getBaseMetaTileEntity().disableWorking();
-        super.afterRecipeCheckFailed();
-    }
-
-    @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (!aBaseMetaTileEntity.isAllowedToWork()) {
-            started = false;
-        }
-        super.onPreTick(aBaseMetaTileEntity, aTick);
-    }
-
-    @Override
-    public void construct(ItemStack stackSize, boolean hintsOnly) {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
-        if (hintsOnly) {
-            TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(),
-                    iGregTechTileEntity.getXCoord() + xDir,
-                    iGregTechTileEntity.getYCoord() + yDir,
-                    iGregTechTileEntity.getZCoord() + zDir,
-                    TT_Container_Casings.sHintCasingsTT, 12);
-        }
-        structureBuild_EM("main", 11, 1, 18, hintsOnly, stackSize);
-    }
-
-    @Override
-    public String[] getStructureDescription(ItemStack stackSize) {
-        return description;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index 84dafb8db2..1978d2acfc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
@@ -50,7 +50,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
-    public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10* AVOGADRO_CONSTANT;
+    public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10* EM_COUNT_PER_MATERIAL_AMOUNT;
     private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 / URANIUM_INGOT_MASS_DIFF;
     public static final double URANIUM_MASS_TO_EU_INSTANT = URANIUM_MASS_TO_EU_PARTIAL * 20;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index e769d3e480..7d5961f219 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.OreDictionaryStack;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -100,38 +100,21 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
             EMInstanceStackMap map = in.getContentHandler();
             for (EMInstanceStack stack : map.valuesToArray()) {
-                {
-                    EMFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
-                    if (info != null) {
-                        if (map.removeAllAmounts(info.input())) {
-                            mOutputFluids = new FluidStack[]{info.output()};
-                            startRecipe(info.input(), stack.getEnergy());
-                            return true;
-                        }
-                    }
-                }
-                {
-                    EMItemDequantizationInfo info = stack.getDefinition().someAmountIntoItemsStack();
-                    if (info != null) {
-                        if (map.removeAllAmounts(info.input())) {
-                            mOutputItems = new ItemStack[]{info.output()};
-                            startRecipe(info.input(), stack.getEnergy());
-                            return true;
-                        }
-                    }
-                }
-                {
-                    EMOredictDequantizationInfo info = stack.getDefinition().someAmountIntoOredictStack();
-                    if (info != null) {
-                        if (map.removeAllAmounts(info.input())) {
-                            ArrayList<ItemStack> items = OreDictionary.getOres(info.getOut());
-                            if (items != null && !items.isEmpty()) {
-                                mOutputItems = new ItemStack[]{items.get(0)};
-                                startRecipe(info.input(), stack.getEnergy());
-                                return true;
-                            }
+                EMDequantizationInfo emDequantizationInfo = TecTech.transformationInfo.getInfoMap().get(stack.getDefinition());
+                if(emDequantizationInfo!=null && emDequantizationInfo.getStack()!=null && map.removeAllAmounts(emDequantizationInfo.getInput())){
+                    Object out=emDequantizationInfo.getStack();
+                    if(out instanceof ItemStack){
+                        mOutputItems=new ItemStack[]{emDequantizationInfo.getItem()};
+                    }else if(out instanceof FluidStack){
+                        mOutputFluids=new FluidStack[]{emDequantizationInfo.getFluid()};
+                    }else if(out instanceof OreDictionaryStack){
+                        ArrayList<ItemStack> items = OreDictionary.getOres(OreDictionary.getOreName(emDequantizationInfo.getOre().getOreId()));
+                        if (items != null && !items.isEmpty()) {
+                            mOutputItems = new ItemStack[]{items.get(0)};
                         }
                     }
+                    startRecipe(emDequantizationInfo.getInput(), stack.getEnergy());
+                    return true;
                 }
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 64949fe402..be036050be 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.DEFAULT_ENERGY_LEVEL;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
@@ -98,9 +97,9 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
-                    EMItemQuantizationInfo aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, false, null));
+                    EMItemQuantizationInfo aIQI = TecTech.transformationInfo.getItemQuantization().get(new EMItemQuantizationInfo(is, false, null));
                     if (aIQI == null) {
-                        aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, true, null));//todo check if works?
+                        aIQI = TecTech.transformationInfo.getItemQuantization().get(new EMItemQuantizationInfo(is, true, null));//todo check if works?
                     }
                     if (aIQI == null) {
                         //ORE DICT quantization //todo fix for uranium?
@@ -109,11 +108,11 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (DEBUG_MODE) {
                                 TecTech.LOGGER.info("Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage() + ' ' + OreDictionary.getOreName(ID));
                             }
-                            EMOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.getOredictQuantization().get(ID);
+                            EMOredictQuantizationInfo aOQI = TecTech.transformationInfo.getOredictQuantization().get(ID);
                             if (aOQI == null) {
                                 continue;
                             }
-                            IEMStack into = aOQI.output();
+                            IEMStack into = aOQI.getOut();
                             if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.getAmount(), is.getItemDamage())}, null, inI)) {
                                 startRecipe(into);
                                 return true;
@@ -136,7 +135,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             FluidStack[] inF = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
-                    EMFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.getFluidQuantization().get(fs.getFluid().getID());
+                    EMFluidQuantizationInfo aFQI = TecTech.transformationInfo.getFluidQuantization().get(fs.getFluid().getID());
                     if (aFQI == null) {
                         continue;
                     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 74bb817142..89255b331a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -309,7 +309,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             NBTTagCompound tNBT = mInventory[1].getTagCompound();//code above makes it not null
 
             tNBT.setString("eMachineType", machineType);
-            tNBT.setTag(E_RECIPE_ID, objectResearched.toNBT());
+            tNBT.setTag(E_RECIPE_ID, objectResearched.toNBT(TecTech.definitionsRegistry));
             tNBT.setString("author", EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.WHITE + ' ' + machineType + " EM Recipe Generator");
         } else if (objectsScanned != null && CustomItemList.scanContainer.isStackEqual(mInventory[1], false, true)) {
             ElementalDefinitionScanStorage_EM.setContent(mInventory[1], objectsScanned, scanComplexity);
@@ -387,7 +387,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         aNBT.setLong("eComputationRemaining", computationRemaining);
         aNBT.setLong("eComputationRequired", computationRequired);
         if (objectResearched != null) {
-            aNBT.setTag("eObject", objectResearched.toNBT());
+            aNBT.setTag("eObject", objectResearched.toNBT(TecTech.definitionsRegistry));
         } else {
             aNBT.removeTag("eObject");
         }
@@ -397,7 +397,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             aNBT.removeTag("eScanComplexity");
         }
         if (objectsScanned != null) {
-            aNBT.setTag("eScanObjects", objectsScanned.toNBT());
+            aNBT.setTag("eScanObjects", objectsScanned.toNBT(TecTech.definitionsRegistry));
         } else {
             aNBT.removeTag("eScanObjects");
         }
@@ -409,7 +409,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         computationRemaining = aNBT.getLong("eComputationRemaining");
         computationRequired = aNBT.getLong("eComputationRequired");
         if (aNBT.hasKey("eObject")) {
-            objectResearched = EMDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject"));
+            objectResearched = EMDefinitionStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eObject"));
             if (objectResearched.getDefinition() == nbtE__) {
                 objectResearched = null;
             }
@@ -423,7 +423,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         }
         try {
             if (aNBT.hasKey("eScanObjects")) {
-                objectsScanned = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eScanObjects"));
+                objectsScanned = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eScanObjects"));
             }
         } catch (EMException e) {
             objectsScanned = new EMInstanceStackMap();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 9a6f99bed8..2fe43cb8e1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -757,7 +757,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             NBTTagCompound output = new NBTTagCompound();
             for (int i = 0; i < outputEM.length; i++) {
                 if (outputEM[i] != null) {
-                    output.setTag(Integer.toString(i), outputEM[i].toNBT());
+                    output.setTag(Integer.toString(i), outputEM[i].toNBT(TecTech.definitionsRegistry));
                 }
             }
             aNBT.setTag("outputEM", output);
@@ -847,7 +847,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             for (int i = 0; i < outputEM.length; i++) {
                 if (compound.hasKey(Integer.toString(i))) {
                     try {
-                        outputEM[i] = EMInstanceStackMap.fromNBT(compound.getCompoundTag(Integer.toString(i)));
+                        outputEM[i] = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,compound.getCompoundTag(Integer.toString(i)));
                     } catch (EMException e) {
                         if (DEBUG_MODE) {
                             e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
new file mode 100644
index 0000000000..cf8f26ff02
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
@@ -0,0 +1,709 @@
+package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
+import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
+import com.github.technus.tectech.mechanics.structure.StructureDefinition;
+import com.github.technus.tectech.thing.block.QuantumGlassBlock;
+import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
+import com.github.technus.tectech.util.CommonValues;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import java.util.HashMap;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
+import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
+import static com.github.technus.tectech.util.DoubleCount.add;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by danie_000 on 17.12.2016.
+ */
+public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
+    //region variables
+    private static Textures.BlockIcons.CustomIcon ScreenOFF;
+    private static Textures.BlockIcons.CustomIcon ScreenON;
+    private static Textures.BlockIcons.CustomIcon ScreenON_Slave;
+    private static Textures.BlockIcons.CustomIcon ScreenOFF_Slave;
+
+    protected static final byte FUSE_MODE = 0, COLLIDE_MODE = 1;
+    private static double MASS_TO_EU_INSTANT;
+    private static int STARTUP_COST, KEEPUP_COST;
+
+    protected byte            eTier = 0;
+    protected EMInstanceStack stack;
+    private   long            plasmaEnergy;
+
+    protected boolean started = false;
+    //endregion
+
+    //region collision handlers
+    public static final HashMap<Long, IColliderHandler> FUSE_HANDLERS = new HashMap<>();
+    public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
+
+    static {
+        FUSE_HANDLERS.put(((long) EMAtomDefinition.getClassTypeStatic() << 16) | EMAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 1;
+            }
+        });
+        registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMPrimitiveTemplate.getClassTypeStatic());
+
+        FUSE_HANDLERS.put(((long) EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 2;
+            }
+        });
+        FUSE_HANDLERS.put(((long) EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 2;
+            }
+        });
+
+        registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAspectFuse(EMPrimitiveTemplate.getClassTypeStatic());
+
+        FUSE_HANDLERS.put(((long) EMPrimitiveTemplate.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
+                if (collisionHandler != null) {
+                    collisionHandler.collide(in2, in1, out);
+                } else {
+                    out.putUnifyAll(in1, in2);
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 2;
+            }
+        });
+
+        PRIMITIVE_FUSE_HANDLERS.put(EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> {
+            try {
+                EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+                defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
+            } catch (Exception e) {
+                out.putUnifyAll(in1, in2);
+                return;
+            }
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+            }
+        });
+        PRIMITIVE_FUSE_HANDLERS.put(EMPrimalAspectDefinition.class.getName() + '\0' + EMPrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
+            if (fuseAspects(in1, in2, out)) return;
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+            }
+        });
+    }
+
+    private static boolean fuseAspects(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+        try {
+            EMDefinitionStackMap defs = new EMDefinitionStackMap();
+            defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+            defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+            EMComplexAspectDefinition aspect = new EMComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+            out.putUnify(new EMInstanceStack(aspect, Math.min(in1.getAmount(), in2.getAmount())));
+        } catch (Exception e) {
+            out.putUnifyAll(in1, in2);
+            return true;
+        }
+        return false;
+    }
+
+    private static void registerSimpleAspectFuse(int classTypeStatic) {
+        FUSE_HANDLERS.put(((long) EMComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                if (fuseAspects(in1, in2, out)) return;
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 1;
+            }
+        });
+    }
+
+    private static void registerSimpleAtomFuse(int classTypeStatic) {
+        FUSE_HANDLERS.put(((long) EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 1;
+            }
+        });
+    }
+    //endregion
+
+    //region parameters
+    protected Parameters.Group.ParameterIn mode;
+    private static final IStatusFunction<GT_MetaTileEntity_EM_collider> MODE_STATUS = (base_EM, p) -> {
+        if (base_EM.isMaster()) {
+            double mode = p.get();
+            if (mode == FUSE_MODE || mode == COLLIDE_MODE) {
+                return STATUS_OK;
+            } else if (mode > 1) {
+                return STATUS_TOO_HIGH;
+            } else if (mode < 0) {
+                return STATUS_TOO_LOW;
+            }
+            return STATUS_WRONG;
+        }
+        return STATUS_OK;
+    };
+    private static final INameFunction<GT_MetaTileEntity_EM_collider> MODE_NAME = (base_EM, p) -> {
+        if (base_EM.isMaster()) {
+            double mode = p.get();
+            if (mode == FUSE_MODE) {
+                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.0");//Mode: Fuse
+            } else if (mode == COLLIDE_MODE) {
+                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.1");//Mode: Collide
+            }
+            return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.2");//Mode: Undefined
+        }
+        return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.3");//Currently Slaves...
+    };
+    //endregion
+
+    //region structure
+    //use multi A energy inputs, use less power the longer it runs
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = StructureDefinition
+            .<GT_MetaTileEntity_EM_collider>builder()
+            .addShapeOldApi("main", new String[][]{
+                    {"I0A0A0", "I00000", "I0A0A0",},
+                    {"H0000000", "G001111100", "H0000000",},
+                    {"F22223332222", "F41155555114", "F22223332222",},
+                    {"E2000000000002", "E4155111115514", "E2000000000002",},
+                    {"D20000E00002", "D41511E11514", "D20000E00002",},
+                    {"C2000I0002", "C4151I1514", "C2000I0002",},
+                    {"B2000K0002", "B4151K1514", "B2000K0002",},
+                    {"B200M002", "A0151M1510", "B200M002",},
+                    {"A0200M0020", "A0151M1510", "A0200M0020",},
+                    {"0020O0200", "0151O1510", "0020O0200",},
+                    {"A030O030", "0151O1510", "A030O030",},
+                    {"0030O0300", "0151O1510", "0030O0300",},
+                    {"A030O030", "0151O1510", "A030O030",},
+                    {"0020O0200", "0151O1510", "0020O0200",},
+                    {"A0200M0020", "A0151M1510", "A0200M0020",},
+                    {"B200M002", "A0151M1510", "B200M002",},
+                    {"B2000K0002", "B4151K1514", "B2000K0002",},
+                    {"C2000I0002", "C4151I1514", "C2000I0002",},
+                    {"D200002&&&200002", "D415112&.&211514", "D200002&&&200002",},
+                    {"E20!!22222!!02", "E4155111115514", "E20!!22222!!02",},
+                    {"F2222#$#2222", "F41155555114", "F2222#$#2222",},
+            })
+            .addElement('0', ofBlock(sBlockCasingsTT, 4))
+            .addElement('1', ofBlock(sBlockCasingsTT, 7))
+            .addElement('2', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 5)))
+            .addElement('3', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('4', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 6)))
+            .addElement('5', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 8), ofBlock(sBlockCasingsTT, 9)))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addClassicToMachineList,
+                    textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList,
+                    textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList,
+                    textureOffset + 4, 3, sBlockCasingsTT, 4))
+            .addElement('#', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList,
+                    textureOffset + 4, 4, sBlockCasingsTT, 4))
+            .build();
+    private static final String[] description = new String[]{
+            EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"),//2 - Elemental Input Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.2"),//3 - Elemental Output Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction
+    };
+
+    @Override
+    public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
+    }
+
+    //endregion
+
+    public GT_MetaTileEntity_EM_collider(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_EM_collider(String aName) {
+        super(aName);
+    }
+
+    public static void setValues(int heliumPlasmaValue) {
+        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07* EM_COUNT_PER_MATERIAL_AMOUNT);//mass diff
+        MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20;
+        STARTUP_COST = -heliumPlasmaValue * 10000;
+        KEEPUP_COST = -heliumPlasmaValue;
+    }
+
+    protected double fuse(GT_MetaTileEntity_EM_collider partner) {///CAN MAKE EU
+        if (partner.stack != null && stack != null) {//todo add single event mode as an option
+            boolean check = stack.getDefinition().fusionMakesEnergy(stack.getEnergy()) &&
+                    partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
+
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = add(stack2.getMass(),stack.getMass());
+            //System.out.println("preMass = " + preMass);
+
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getMatterMassType() > stack.getDefinition().getMatterMassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            } else {
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            }
+            for (EMInstanceStack newStack : map.valuesToArray()) {
+                check &= newStack.getDefinition().fusionMakesEnergy(newStack.getEnergy());
+            }
+            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
+            outputEM = new EMInstanceStackMap[]{map};
+
+            partner.stack = stack = null;
+            //System.out.println("check = " + check);
+            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
+            return check ? preMass - map.getMass() : Math.min(preMass - map.getMass(), 0);
+        }
+        return 0;
+    }
+
+    protected double collide(GT_MetaTileEntity_EM_collider partner) {//DOES NOT MAKE EU!
+        if (partner.stack != null && stack != null) {//todo add single event mode as an option
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = stack2.getMass() + stack.getMass();
+            //System.out.println("preMass = " + preMass);
+
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getMatterMassType() > stack.getDefinition().getMatterMassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            } else {
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            }
+            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
+            outputEM = new EMInstanceStackMap[]{map};
+
+            partner.stack = stack = null;
+            //System.out.println("check = " + check);
+            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
+            return Math.min(preMass - map.getMass(), 0);
+        }
+        return 0;
+    }
+
+    private boolean handleRecipe(EMInstanceStack stack2, EMInstanceStackMap map, IColliderHandler colliderHandler) {
+        if (colliderHandler != null && eTier >= colliderHandler.getRequiredTier()) {
+            colliderHandler.collide(stack2, stack, map);
+        } else {
+            map.putUnifyAll(stack, stack2);
+            outputEM = new EMInstanceStackMap[]{map};
+            return true;
+        }
+        return false;
+    }
+
+    protected GT_MetaTileEntity_EM_collider getPartner() {
+        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
+        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        IGregTechTileEntity gregTechBaseTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir);
+        if (gregTechBaseTileEntity != null) {
+            IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity();
+            return gregTechMetaTileEntity instanceof GT_MetaTileEntity_EM_collider &&
+                    ((GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity).mMachine &&
+                    gregTechBaseTileEntity.getBackFacing() == iGregTechTileEntity.getFrontFacing() ?
+                    (GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity : null;
+        }
+        return null;
+    }
+
+    protected final boolean isMaster() {
+        return getBaseMetaTileEntity().getFrontFacing() % 2 == 0;
+    }
+
+    private void makeEU(double massDiff) {
+        plasmaEnergy += massDiff * MASS_TO_EU_INSTANT;
+        if (DEBUG_MODE) {
+            System.out.println("plasmaEnergy = " + plasmaEnergy);
+        }
+    }
+
+    private EMInstanceStackMap tickStack() {
+        if (stack == null) {
+            return null;
+        }
+        stack.setAge(stack.getAge() + 1);
+        EMDecayResult newInstances = stack.decay(1, stack.getAge(), 0);
+        if (newInstances == null) {
+            stack.nextColor();
+            return null;
+        } else {
+            stack = newInstances.getOutput().removeKey(newInstances.getOutput().getLast().getDefinition());
+            return newInstances.getOutput();
+        }
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_EM_collider(mName);
+    }
+
+    @Override
+    public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
+        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 2;
+        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 2;
+        if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir) != sBlockCasingsTT) {
+            eTier = 0;
+            return false;
+        }
+
+        if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 8) {
+            eTier = 1;
+        } else if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 9) {
+            eTier = 2;
+        } else {
+            eTier = 0;
+            return false;
+        }
+        if (structureCheck_EM("main", 11, 1, 18)) {
+            return true;
+        }
+        eTier = 0;
+        return false;
+    }
+
+    @Override
+    public boolean checkRecipe_EM(ItemStack itemStack) {
+        GT_MetaTileEntity_EM_collider partner = getPartner();
+        if (partner == null) {
+            return false;
+        }
+        mEfficiencyIncrease = 10000;
+        if (started) {
+            if (stack == null) {
+                for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
+                    EMInstanceStackMap container = inputElemental.getContentHandler();
+                    if (container.isEmpty()) {
+                        continue;
+                    }
+                    stack = container.removeKey(container.getFirst().getDefinition());
+                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / EMAtomDefinition.getSomethingHeavy().getMass())) / 2;
+                    if (eut < Integer.MIN_VALUE + 7) {
+                        return false;
+                    }
+                    mMaxProgresstime = 20;
+                    mEUt = (int) eut;
+                    eAmpereFlow = 5;
+                    return true;
+                }
+                mMaxProgresstime = 20;
+                mEUt = KEEPUP_COST;
+                eAmpereFlow = 1;
+                return true;
+            }
+            mMaxProgresstime = 20;
+            mEUt = KEEPUP_COST;
+            eAmpereFlow = 2;
+        } else {
+            started = true;
+            mMaxProgresstime = 20;
+            mEUt = STARTUP_COST;
+            eAmpereFlow = 10;
+        }
+        return true;
+    }
+
+    @Override
+    public void outputAfterRecipe_EM() {
+        GT_MetaTileEntity_EM_collider partner = getPartner();
+        if (partner == null) {
+            if (stack != null) {
+                cleanMassEM_EM(stack.getMass());
+                stack = null;
+            }
+            return;
+        }
+        if (isMaster()) {
+            switch ((int) mode.get()) {
+                case FUSE_MODE:
+                    makeEU(fuse(partner));
+                    break;
+                case COLLIDE_MODE:
+                    collide(partner);//todo
+                    break;
+                default: {
+                    outputEM = new EMInstanceStackMap[2];
+                    outputEM[1] = tickStack();
+                    if (outputEM[1] == null) {
+                        outputEM[1] = partner.tickStack();
+                    } else {
+                        EMInstanceStackMap map = partner.tickStack();
+                        if (map != null) {
+                            outputEM[1].putUnifyAll(map);
+                        }
+                    }
+                }
+            }
+            if (outputEM != null) {
+                for (int i = 0, lim = Math.min(outputEM.length, eOutputHatches.size()); i < lim; i++) {
+                    if (outputEM[i] != null) {
+                        eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
+                        outputEM[i] = null;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public String[] getDescription() {
+        return new String[]{
+                CommonValues.TEC_MARK_EM,
+                translateToLocal("gt.blockmachines.multimachine.em.collider.desc.0"),//Collide matter at extreme velocities.
+                EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.collider.desc.1")//Faster than light*!!!
+        };
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister aBlockIconRegister) {
+        ScreenOFF = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER");
+        ScreenON = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE");
+        ScreenOFF_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_SLAVE");
+        ScreenON_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE_SLAVE");
+        super.registerIcons(aBlockIconRegister);
+    }
+
+    @Override
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        if (aSide == aFacing) {
+            if (aFacing % 2 == 0) {
+                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF)};
+            } else {
+                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON_Slave : ScreenOFF_Slave)};
+            }
+        }
+        return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4]};
+    }
+
+    @Override
+    protected void parametersInstantiation_EM() {
+        Parameters.Group hatch_0 = parametrization.getGroup(0);
+        mode = hatch_0.makeInParameter(0, FUSE_MODE, MODE_NAME, MODE_STATUS);
+    }
+
+    @Override
+    public void parametersStatusesWrite_EM(boolean machineBusy) {
+        if (isMaster()) {
+            super.parametersStatusesWrite_EM(machineBusy);
+        }
+    }
+
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setByte("eTier", eTier);//collider tier
+        aNBT.setBoolean("eStarted", started);
+        if (stack != null) {
+            aNBT.setTag("eStack", stack.toNBT(TecTech.definitionsRegistry));
+        }
+        aNBT.setLong("ePlasmaEnergy", plasmaEnergy);
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        eTier = aNBT.getByte("eTier");//collider tier
+        started = aNBT.getBoolean("eStarted");
+        if (aNBT.hasKey("eStack")) {
+            stack = EMInstanceStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eStack"));
+        }
+        plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
+    }
+
+    @Override
+    public void stopMachine() {
+        started = false;
+        if (stack != null) {
+            cleanMassEM_EM(stack.getMass());
+            stack = null;
+        }
+        super.stopMachine();
+    }
+
+    @Override
+    protected void afterRecipeCheckFailed() {
+        started = false;
+        if (stack != null) {
+            cleanMassEM_EM(stack.getMass());
+            stack = null;
+        }
+        getBaseMetaTileEntity().disableWorking();
+        super.afterRecipeCheckFailed();
+    }
+
+    @Override
+    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (!aBaseMetaTileEntity.isAllowedToWork()) {
+            started = false;
+        }
+        super.onPreTick(aBaseMetaTileEntity, aTick);
+    }
+
+    @Override
+    public void construct(ItemStack stackSize, boolean hintsOnly) {
+        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
+        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        if (hintsOnly) {
+            TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(),
+                    iGregTechTileEntity.getXCoord() + xDir,
+                    iGregTechTileEntity.getYCoord() + yDir,
+                    iGregTechTileEntity.getZCoord() + zDir,
+                    TT_Container_Casings.sHintCasingsTT, 12);
+        }
+        structureBuild_EM("main", 11, 1, 18, hintsOnly, stackSize);
+    }
+
+    @Override
+    public String[] getStructureDescription(ItemStack stackSize) {
+        return description;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java
new file mode 100644
index 0000000000..0114ac847b
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java
@@ -0,0 +1,5 @@
+package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider;
+
+public interface IColliderHandler extends IPrimitiveColliderHandler {
+    byte getRequiredTier();
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java
new file mode 100644
index 0000000000..3c4438b5e1
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java
@@ -0,0 +1,8 @@
+package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+
+public interface IPrimitiveColliderHandler {
+    void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out);
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
index d1eafa22fc..e6e618a31c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
@@ -12,8 +12,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import java.util.Arrays;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.DoubleCount.*;
@@ -77,7 +76,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         maxRPM = Math.sqrt(maxRCF / (0.001118D * radius));
         double maxSafeMass = EMAtomDefinition.getSomethingHeavy().getMass() * (1 << tier);
         maxForce = maxSafeMass * maxRCF;// (eV/c^2 * m/s) / g
-        maxCapacity = maxSafeMass * AVOGADRO_CONSTANT_144 * radius;// eV/c^2
+        maxCapacity = maxSafeMass * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * radius;// eV/c^2
     }
 
     private double getRCF(double RPM) {
@@ -128,7 +127,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
             EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
             double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
             randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
-            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+            if (randomStack.isInvalidAmount()) {
                 input.removeKey(randomStack.getDefinition());
                 stacks = input.valuesToArray();
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
index 70d93b36ed..3d1259f808 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
@@ -9,10 +9,9 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
-import static com.github.technus.tectech.util.CommonValues.V;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
+import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.DoubleCount.mul;
 import static com.github.technus.tectech.util.DoubleCount.sub;
 
@@ -89,7 +88,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
     public Behaviour_ElectromagneticSeparator(int desiredTier){
         tier=(byte) desiredTier;
         ticks =Math.max(20,(1<<(12-desiredTier))*20);
-        maxCapacity= EMAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* AVOGADRO_CONSTANT_144;
+        maxCapacity= EMAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
         maxCharge=144D*(1<<(tier-5));
         switch (tier){
             case 12:
@@ -159,7 +158,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
             EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
             double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
             randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
-            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+            if (randomStack.isInvalidAmount()) {
                 input.removeKey(randomStack.getDefinition());
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
diff --git a/src/main/java/com/github/technus/tectech/util/DoubleCount.java b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
index 576123079c..f5c391ab43 100644
--- a/src/main/java/com/github/technus/tectech/util/DoubleCount.java
+++ b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
@@ -102,6 +102,9 @@ public class DoubleCount {
             return count - value;
         } else {
             double result = count - value;
+            if(result==count||result==value){
+                return result;
+            }
             return result - ulpSigned(result);
         }
     }
@@ -111,6 +114,9 @@ public class DoubleCount {
             return count + value;
         } else {
             double result = count + value;
+            if(result==count||result==value){
+                return result;
+            }
             return result - ulpSigned(result);
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/util/Util.java b/src/main/java/com/github/technus/tectech/util/Util.java
index 1843770e3a..78522a2ae8 100644
--- a/src/main/java/com/github/technus/tectech/util/Util.java
+++ b/src/main/java/com/github/technus/tectech/util/Util.java
@@ -561,4 +561,16 @@ public final class Util {
         int z=chunk.zPosition<<4;
         return AxisAlignedBB.getBoundingBox(x,-128,z,x+16,512,z+16);
     }
+
+    public static String getConcated(String[] strings,String separator){
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String string : strings) {
+            stringBuilder.append(string).append(separator);
+        }
+        int length = stringBuilder.length();
+        if(length >=separator.length()){
+            stringBuilder.setLength(length -separator.length());
+        }
+        return stringBuilder.toString();
+    }
 }
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 89d2b517a2..a5b5051827 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -798,20 +798,17 @@ gt.blockmachines.debug.tt.writer.desc.2=ABC axises aligned to machine front
 tt.keyword.ID=ID
 #Example: 32EU at 1A
 tt.keyword.at=at
-#These are Thaumcraft aspects
-tt.keyword.Air=Air
-tt.keyword.Earth=Earth
-tt.keyword.Fire=Fire
-tt.keyword.Water=Water
-tt.keyword.Order=Order
-tt.keyword.Entropy=Entropy
-tt.keyword.Primal=Primal
-tt.keyword.Aspect=Aspect
+#EM scan result
 tt.keyword.CLASS=CLASS
 tt.keyword.NAME=NAME
 tt.keyword.CHARGE=CHARGE
 tt.keyword.COLORLESS=COLORLESS
 tt.keyword.MASS=MASS
+tt.keyphrase.LIFE_TIME=LIFE TIME
+tt.keyphrase.CARRIES_COLOR=CARRIES COLOR
+tt.keyphrase.Hint_Details=Hint Details
+tt.keyphrase.At_current_energy_level=At current energy level
+#debug boom
 tt.keyword.BOOM=BOOM!
 tt.keyword.Destination=Destination
 tt.keyword.Weight=Weight
@@ -834,10 +831,6 @@ tt.keyword.Status=Status
 tt.keyword.Content=Content
 tt.keyword.PacketHistory=PacketHistory
 
-tt.keyphrase.LIFE_TIME=LIFE TIME
-tt.keyphrase.CARRIES_COLOR=CARRIES COLOR
-tt.keyphrase.Hint_Details=Hint Details
-tt.keyphrase.At_current_energy_level=At current energy level
 #Used when 0 Elemental Matter Stacks
 tt.keyphrase.No_Stacks=No Stacks
 tt.keyphrase.Contains_EM=Contains EM
@@ -875,3 +868,87 @@ tt.keyphrase.Side_capabilities=Side capabilities
 #OpenTurrets compatibility
 tile.turretHeadEM.name=Elemental Matter Turret
 tile.turretBaseEM.name=Elemental Turret Base
+
+tt.keyword.mol=mol
+tt.keyword.itemMols=items
+tt.keyword.mbMols=mb
+#EM types
+tt.keyword.Primitive=Primitive
+tt.keyword.Element=Element
+tt.keyword.Atom=Atom
+tt.keyword.Isotope=Isotope
+tt.keyword.Boson=Boson
+tt.keyword.Fermion=Fermion
+tt.keyword.GaugeBoson=Gauge boson
+tt.keyword.Meson=Meson
+tt.keyword.Baryon=Baryon
+tt.keyword.Tetraquark=Tetraquark
+tt.keyword.Pentaquark=Pentaquark
+tt.keyword.Hexaquark=Hexaquark
+tt.keyword.Hadron=Hadron
+tt.keyword.Neutrino=Neutrino
+tt.keyword.Quark=Quark
+tt.keyword.ScalarBoson=Scalar boson
+#em definitions
+tt.keyword.PrimitiveNBTERROR=NBT ERROR
+tt.keyword.PrimitiveNULLPOINTER=NULL POINTER
+tt.keyword.PrimitiveSpace=Space
+tt.keyword.PrimitivePresence=Presence
+tt.keyword.PrimitiveMass=Mass
+tt.keyword.PrimitiveDarkMass=DarkMass
+tt.keyword.PrimitiveEnergy=Energy
+tt.keyword.PrimitiveDarkEnergy=DarkEnergy
+tt.keyword.PrimitiveMagic=Magic
+tt.keyword.PrimitiveAntimagic=Antimagic
+tt.keyword.Gluon=Gluon
+tt.keyword.Photon=Photon
+tt.keyword.Weak0=Weak
+tt.keyword.WeakPlus=Weak+
+tt.keyword.WeakMinus=Weak-
+tt.keyword.Proton=Proton
+tt.keyword.AntiProton=Antiproton
+tt.keyword.Neutron=Neutron
+tt.keyword.AntiNeutron=Antineutron
+tt.keyword.Lepton=Lepton
+tt.keyword.Electron=Electron
+tt.keyword.Muon=Muon
+tt.keyword.Tauon=Tauon
+tt.keyword.Positron=Positron
+tt.keyword.Antimuon=Antimuon
+tt.keyword.Antitauon=Antitauon
+tt.keyword.ElectronNeutrino=Electron neutrino
+tt.keyword.MuonNeutrino=Muon neutrino
+tt.keyword.TauonNeutrino=Tauon neutrino
+tt.keyword.PositronNeutrino=Positron neutrino
+tt.keyword.AntimuonNeutrino=Antimuon neutrino
+tt.keyword.AntitauonNeutrino=Antitauon neutrino
+tt.keyword.QuarkUp=Up
+tt.keyword.QuarkCharm=Charm
+tt.keyword.QuarkTop=Top
+tt.keyword.QuarkDown=Down
+tt.keyword.QuarkStrange=Strange
+tt.keyword.QuarkBottom=Bottom
+tt.keyword.QuarkAntiUp=Antiup
+tt.keyword.QuarkAntiCharm=Anticharm
+tt.keyword.QuarkAntiTop=Antitop
+tt.keyword.QuarkAntiDown=Antidown
+tt.keyword.QuarkAntiStrange=Antistrange
+tt.keyword.QuarkAntiBottom=Antibottom
+tt.keyword.Higgs=Higgs
+#These are Thaumcraft aspects
+tt.keyword.Air=Air
+tt.keyword.Earth=Earth
+tt.keyword.Fire=Fire
+tt.keyword.Water=Water
+tt.keyword.Order=Order
+tt.keyword.Entropy=Entropy
+tt.keyword.Chaos=Chaos
+
+tt.keyword.Primal=Primal
+tt.keyword.Aspect=Aspect
+
+
+
+
+
+
-- 
cgit 


From e37d21d8141e82eee9d87d4bb137c44977db8625 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 23 Jan 2022 13:44:18 +0100
Subject: Fix autocompletion for EM commands

---
 .../mechanics/elementalMatter/core/commands/EMGive.java     |  2 +-
 .../mechanics/elementalMatter/core/commands/EMList.java     | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
index 18f2f76498..4824053668 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -117,7 +117,7 @@ public class EMGive implements ICommand {
 
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if (args.length > 1 && args.length % 2 == 0) {
+        if (args.length > 2 && args.length % 2 == 1) {
             return new ArrayList<>(TecTech.definitionsRegistry.getBinds().keySet());
         }
         return null;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
index 90eddf1e23..fe542abbde 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -28,15 +28,16 @@ public class EMList implements ICommand {
             if(args.length == 0) {
                 listClasses(sender);
             }else {
-                listDefinitions(sender, Util.getConcated(args," "));
+                String concated = Util.getConcated(args, " ");
+                listDefinitions(sender,concated, concated.replaceAll(" ","_"),concated.replaceAll("_"," "));
             }
         }
     }
 
-    private void listDefinitions(ICommandSender sender, String arg) {
+    private void listDefinitions(ICommandSender sender,String raw, String unlocalized,String localized) {
         sender.addChatMessage(new ChatComponentText("    Available Direct: tag - name symbol"));
         for (EMType directType : TecTech.definitionsRegistry.getDirectTypes().values()) {
-            if ("*".equals(arg) || arg.equalsIgnoreCase(directType.getLocalizedName())) {
+            if ("*".equals(raw) || localized.equalsIgnoreCase(directType.getLocalizedName()) || unlocalized.equalsIgnoreCase(directType.getUnlocalizedName())) {
                 directType.getDefinitions().forEach((bind, definition) ->
                         sender.addChatMessage(new ChatComponentText(bind + " - " + definition.getLocalizedName() + " " + definition.getSymbol())));
             }
@@ -44,7 +45,7 @@ public class EMList implements ICommand {
     }
 
     private void listClasses(ICommandSender sender) {
-        sender.addChatMessage(new ChatComponentText("    Available Direct: name (use name as parameter to learn more"));
+        sender.addChatMessage(new ChatComponentText("    Available Direct: name (use as parameter to learn more"));
         TecTech.definitionsRegistry.getDirectTypes().forEach((aClass, emDirectType) ->
                 sender.addChatMessage(new ChatComponentText(emDirectType.getLocalizedName())));
         sender.addChatMessage(new ChatComponentText("    Available Indirect: tag - name"));
@@ -69,8 +70,8 @@ public class EMList implements ICommand {
 
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==0){
-            return TecTech.definitionsRegistry.getDirectTypes().values().stream().map(EMType::getLocalizedName).collect(Collectors.toList());
+        if(args.length==1){
+            return TecTech.definitionsRegistry.getDirectTypes().values().stream().map(EMType::getLocalizedName).map(s->s.replaceAll(" ","_")).collect(Collectors.toList());
         }
         return null;
     }
-- 
cgit 


From caff4351909ce59637348c6be94271cf1d1c0a9c Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 23 Jan 2022 14:47:42 +0100
Subject: Separate EM to new tab

---
 src/main/java/com/github/technus/tectech/TecTech.java |  4 +++-
 .../com/github/technus/tectech/loader/MainLoader.java |  2 ++
 .../technus/tectech/loader/gui/CreativeTabEM.java     | 19 +++++++++++++++++++
 .../technus/tectech/mechanics/elementalMatter/README  |  5 ++++-
 .../elementalMatter/core/maps/EMInstanceStackMap.java |  5 -----
 .../item/DebugElementalInstanceContainer_EM.java      |  4 ++--
 .../thing/item/ElementalDefinitionContainer_EM.java   | 10 +++++-----
 .../thing/item/ElementalDefinitionScanStorage_EM.java |  4 ++--
 .../GT_MetaTileEntity_Hatch_ElementalContainer.java   |  4 ++--
 src/main/resources/assets/tectech/lang/en_US.lang     |  1 +
 10 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index d730d64a65..10b8f69b1a 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -3,6 +3,7 @@ package com.github.technus.tectech;
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.TecTechConfig;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
+import com.github.technus.tectech.loader.gui.CreativeTabEM;
 import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler;
 import com.github.technus.tectech.mechanics.anomaly.CancerCommand;
 import com.github.technus.tectech.mechanics.anomaly.ChargeCommand;
@@ -45,7 +46,8 @@ public class TecTech {
 
     public static final XSTR RANDOM = XSTR.XSTR_INSTANCE;
     public static final LogHelper          LOGGER = new LogHelper(Reference.MODID);
-    public static       CreativeTabTecTech creativeTabTecTech;
+    public static CreativeTabTecTech creativeTabTecTech;
+    public static CreativeTabEM      creativeTabEM;
 
     private static IngameErrorLog moduleAdminErrorLogs;
     public static TecTechConfig configTecTech;
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index e2f1e2882f..b9d737f98a 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.trans
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompatEnabled;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
+import com.github.technus.tectech.loader.gui.CreativeTabEM;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
 import com.github.technus.tectech.loader.recipe.BaseRecipeLoader;
 import com.github.technus.tectech.loader.thing.ComponentLoader;
@@ -64,6 +65,7 @@ public final class MainLoader {
 
     public static void preLoad(){
         creativeTabTecTech =new CreativeTabTecTech("TecTech");
+        creativeTabEM =new CreativeTabEM("EM");
 
         //set expanded texture arrays for tiers
         try {
diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java
new file mode 100644
index 0000000000..cd73d1e420
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java
@@ -0,0 +1,19 @@
+package com.github.technus.tectech.loader.gui;
+
+import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+public class CreativeTabEM extends CreativeTabs {
+    public CreativeTabEM(String name) {
+        super(name);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public Item getTabIconItem() {
+        return ElementalDefinitionContainer_EM.INSTANCE;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README
index f6c0b35e5f..c774b126c8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README
@@ -41,4 +41,7 @@ Trees:
 
  InstanceStack - inst stack
  |||||multiple to 1
- InstanceStackTree - inst container - real things go here
\ No newline at end of file
+ InstanceStackTree - inst container - real things go here
+
+ Preset for world:
+ 2;7,16x22,16x35:11,16x35:3,16x35;0;
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
index 64ff7063e8..265d219168 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -117,11 +117,6 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return list;
     }
 
-    //Tick Content
-    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
-        return tickContent(lifeTimeMult,postEnergize,1D);
-    }
-
     public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
         //cleanUp();
         double diff=0;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index d909054196..ecebc6afcd 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -29,8 +29,8 @@ import java.util.Collections;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.TecTech.creativeTabEM;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -46,7 +46,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         setMaxStackSize(1);
         setUnlocalizedName("em.debugContainer");
         setTextureName(MODID + ":itemDebugContainer");
-        setCreativeTab(creativeTabTecTech);
+        setCreativeTab(creativeTabEM);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index f0f59e0e86..0de8bb007a 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.item;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
+import com.github.technus.tectech.util.CommonValues;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.gui.FontRenderer;
@@ -20,8 +20,8 @@ import java.util.Collections;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.TecTech.creativeTabEM;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -35,7 +35,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         setMaxStackSize(1);
         setUnlocalizedName("em.definitionContainer");
         setTextureName(MODID + ":itemDefinitionContainer");
-        setCreativeTab(creativeTabTecTech);
+        setCreativeTab(creativeTabEM);
     }
 
     //return previous thing
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index 8b8133a1e2..1cb6de1df6 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -1,13 +1,13 @@
 package com.github.technus.tectech.thing.item;
 
-import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
+import com.github.technus.tectech.util.CommonValues;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 84f18ad2bf..6cb83f5d46 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -112,7 +112,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
             byte Tick = (byte) (aTick % 20);
             if (DECAY_AT == Tick) {
                 purgeOverflow();
-                content.tickContentByOneSecond(1, postEnergize);//Hatches don't life time mult things
+                content.tickContent(1, postEnergize,1);//Hatches don't life time mult things
                 purgeOverflow();
             } else if (OVERFLOW_AT == Tick) {
                 if (overflowMatter <= 0) {
@@ -206,7 +206,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     public int getMaxStacksCount() {
-        return mTier * 128;
+        return mTier * mTier >> 4;
     }
 
     public double getMaxStackSize() {
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index a5b5051827..f69f250e78 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -1,5 +1,6 @@
 #Creative Tab Name
 itemGroup.TecTech=TecTech Interdimensional
+itemGroup.EM=TecTech Elemental Matter
 
 #Blocks
 tile.quantumStuff.name=Quantum Stuff
-- 
cgit 


From 7adcaf6d9b4a8628711a01ce2467f13582cea7d5 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 27 Jan 2022 22:09:30 +0100
Subject: Cleanup Atoms Localization, and FontRenderer

---
 .../technus/tectech/font/TecTechFontRender.java    | 240 ++++++++++++------
 .../definitions/complex/EMAtomDefinition.java      | 113 ++++-----
 .../item/DebugElementalInstanceContainer_EM.java   |   9 +-
 src/main/resources/META-INF/tectech_at.cfg         |  17 +-
 src/main/resources/assets/tectech/lang/en_US.lang  | 268 ++++++++++++++++++++-
 5 files changed, 498 insertions(+), 149 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
index 4aea8bce92..fbbc12fe36 100644
--- a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
+++ b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
@@ -1,85 +1,182 @@
 package com.github.technus.tectech.font;
 
+import com.ibm.icu.text.ArabicShaping;
+import com.ibm.icu.text.ArabicShapingException;
+import com.ibm.icu.text.Bidi;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.settings.GameSettings;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 @SideOnly(Side.CLIENT)
 public class TecTechFontRender extends FontRenderer {
     public static final TecTechFontRender INSTANCE = new TecTechFontRender();
 
-    private static float DISTANCE_L = .125F;
-    private static float DISTANCE_L2 = DISTANCE_L *2F;
+    private static float DISTANCE_L  = .125F;
+    private static float DISTANCE_L2 = DISTANCE_L * 2F;
 
-    private static float DISTANCE_M = 0.06F;
-    private static float DISTANCE_M2 = DISTANCE_M *2F;
+    private static float DISTANCE_M  = 0.06F;
+    private static float DISTANCE_M2 = DISTANCE_M * 2F;
 
-    private static float DISTANCE_A = 0.06F;
-    private static float DISTANCE_A2 = DISTANCE_A *2F;
+    private static float DISTANCE_A  = 0.06F;
+    private static float DISTANCE_A2 = DISTANCE_A * 2F;
 
-    private static final Method reset;
-    private static final Method render;
 
-    private final GameSettings gameSettings;
+    private TecTechFontRender() {
+        super(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false);
+    }
 
-    static {
-        Method resetMethod,renderMethod;
-        try {
-            resetMethod =FontRenderer.class.getDeclaredMethod("resetStyles");
-            renderMethod=FontRenderer.class.getDeclaredMethod("renderString", String.class, int.class, int.class, int.class, boolean.class);
-        } catch (NoSuchMethodException e) {
-            try {
-                resetMethod =FontRenderer.class.getDeclaredMethod("func_78265_b");
-                renderMethod=FontRenderer.class.getDeclaredMethod("func_78258_a", String.class, int.class, int.class, int.class, boolean.class);
-            } catch (NoSuchMethodException ex) {
-                throw new RuntimeException("Cannot get methods!",ex);
-            }
-        }
-        resetMethod.setAccessible(true);
-        renderMethod.setAccessible(true);
-        reset=resetMethod;
-        render=renderMethod;
+    private void resetStyles() {
+        this.randomStyle = false;
+        this.boldStyle = false;
+        this.italicStyle = false;
+        this.underlineStyle = false;
+        this.strikethroughStyle = false;
     }
 
-    private TecTechFontRender() {
-        super(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false);
-        gameSettings = Minecraft.getMinecraft().gameSettings;
+    private int renderString(String p_78258_1_, int p_78258_2_, int p_78258_3_, int p_78258_4_, boolean p_78258_5_) {
+        if (p_78258_1_ == null) {
+            return 0;
+        } else {
+            if (this.bidiFlag) {
+                p_78258_1_ = this.bidiReorder(p_78258_1_);
+            }
+
+            if ((p_78258_4_ & -67108864) == 0) {
+                p_78258_4_ |= -16777216;
+            }
+
+            if (p_78258_5_) {
+                p_78258_4_ = (p_78258_4_ & 16579836) >> 2 | p_78258_4_ & -16777216;
+            }
+
+            this.red = (float)(p_78258_4_ >> 16 & 255) / 255.0F;
+            this.blue = (float)(p_78258_4_ >> 8 & 255) / 255.0F;
+            this.green = (float)(p_78258_4_ & 255) / 255.0F;
+            this.alpha = (float)(p_78258_4_ >> 24 & 255) / 255.0F;
+            this.setColor(this.red, this.blue, this.green, this.alpha);
+            this.posX = (float)p_78258_2_;
+            this.posY = (float)p_78258_3_;
+            this.renderStringAtPos(p_78258_1_, p_78258_5_);
+            return (int)this.posX;
+        }
     }
 
-    private void resetStyles2(){
+    private String bidiReorder(String p_147647_1_) {
         try {
-            reset.invoke(this);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException("Cannot run method resetStyles!",e);
+            Bidi bidi = new Bidi((new ArabicShaping(8)).shape(p_147647_1_), 127);
+            bidi.setReorderingMode(0);
+            return bidi.writeReordered(2);
+        } catch (ArabicShapingException var3) {
+            return p_147647_1_;
         }
     }
 
-    private int renderString2(String str, int x, int y, int color, boolean dropShadow){
-        try {
-            return (int)render.invoke(this,str,x,y,color,dropShadow);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException("Cannot run method renderString!",e);
+    private void renderStringAtPos(String p_78255_1_, boolean p_78255_2_) {
+        for(int i = 0; i < p_78255_1_.length(); ++i) {
+            char c0 = p_78255_1_.charAt(i);
+            int j;
+            int k;
+            if (c0 == 167 && i + 1 < p_78255_1_.length()) {
+                j = "0123456789abcdefklmnor".indexOf(p_78255_1_.toLowerCase().charAt(i + 1));
+                if (j < 16) {
+                    this.randomStyle = false;
+                    this.boldStyle = false;
+                    this.strikethroughStyle = false;
+                    this.underlineStyle = false;
+                    this.italicStyle = false;
+                    if (j < 0 || j > 15) {
+                        j = 15;
+                    }
+
+                    if (p_78255_2_) {
+                        j += 16;
+                    }
+
+                    k = this.colorCode[j];
+                    this.textColor = k;
+                    this.setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.alpha);
+                } else if (j == 16) {
+                    this.randomStyle = true;
+                } else if (j == 17) {
+                    this.boldStyle = true;
+                } else if (j == 18) {
+                    this.strikethroughStyle = true;
+                } else if (j == 19) {
+                    this.underlineStyle = true;
+                } else if (j == 20) {
+                    this.italicStyle = true;
+                } else if (j == 21) {
+                    this.randomStyle = false;
+                    this.boldStyle = false;
+                    this.strikethroughStyle = false;
+                    this.underlineStyle = false;
+                    this.italicStyle = false;
+                    this.setColor(this.red, this.blue, this.green, this.alpha);
+                }
+
+                ++i;
+            } else {
+                j = "ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u0000".indexOf(c0);
+                if (this.randomStyle && j != -1) {
+                    do {
+                        k = this.fontRandom.nextInt(this.charWidth.length);
+                    } while(this.charWidth[j] != this.charWidth[k]);
+
+                    j = k;
+                }
+
+                float f1 = this.unicodeFlag ? 0.5F : 1.0F;
+                boolean flag1 = (c0 == 0 || j == -1 || this.unicodeFlag) && p_78255_2_;
+                if (flag1) {
+                    this.posX -= f1;
+                    this.posY -= f1;
+                }
+
+                float f = this.renderCharAtPos(j, c0, this.italicStyle);
+                if (flag1) {
+                    this.posX += f1;
+                    this.posY += f1;
+                }
+
+                if (this.boldStyle) {
+                    this.posX += f1;
+                    if (flag1) {
+                        this.posX -= f1;
+                        this.posY -= f1;
+                    }
+
+                    this.renderCharAtPos(j, c0, this.italicStyle);
+                    this.posX -= f1;
+                    if (flag1) {
+                        this.posX += f1;
+                        this.posY += f1;
+                    }
+
+                    ++f;
+                }
+
+                this.doDraw(f);
+            }
         }
+
     }
 
+    private float renderCharAtPos(int p_78278_1_, char p_78278_2_, boolean p_78278_3_) {
+        return p_78278_2_ == ' ' ? 4.0F : ("ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u0000".indexOf(p_78278_2_) != -1 && !this.unicodeFlag ? this.renderDefaultChar(p_78278_1_, p_78278_3_) : this.renderUnicodeChar(p_78278_2_, p_78278_3_));
+    }
 
     @Override
     public int drawString(String str, int x, int y, int color, boolean dropShadow) {
-        switch (gameSettings.guiScale){
+        switch (Minecraft.getMinecraft().gameSettings.guiScale) {
             case 0:
                 setUnicodeFlag(true);
                 y--;
                 GL11.glPushMatrix();
 
-                if (dropShadow)
-                {
+                if (dropShadow) {
                     GL11.glTranslatef(DISTANCE_A, DISTANCE_A, 0F);
                     drawStringBack(str, x, y, color);
                     GL11.glTranslatef(-DISTANCE_A2, 0, 0F);
@@ -106,8 +203,7 @@ public class TecTechFontRender extends FontRenderer {
                 y--;
                 GL11.glPushMatrix();
 
-                if (dropShadow)
-                {
+                if (dropShadow) {
                     GL11.glTranslatef(DISTANCE_M, DISTANCE_M, 0F);
                     drawStringBack(str, x, y, color);
                     GL11.glTranslatef(-DISTANCE_M2, 0, 0F);
@@ -132,8 +228,7 @@ public class TecTechFontRender extends FontRenderer {
                 y--;
                 GL11.glPushMatrix();
 
-                if (dropShadow)
-                {
+                if (dropShadow) {
                     GL11.glTranslatef(DISTANCE_L, DISTANCE_L, 0F);
                     drawStringBack(str, x, y, color);
                     GL11.glTranslatef(-DISTANCE_L2, 0, 0F);
@@ -159,7 +254,7 @@ public class TecTechFontRender extends FontRenderer {
 
     @Override
     public void drawSplitString(String str, int x, int y, int maxWidth, int color) {
-        switch (gameSettings.guiScale){
+        switch (Minecraft.getMinecraft().gameSettings.guiScale) {
             case 0:
                 setUnicodeFlag(true);
                 y--;
@@ -213,50 +308,40 @@ public class TecTechFontRender extends FontRenderer {
 
     private int drawStringFront(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_) {
         GL11.glEnable(3008);
-        resetStyles2();
-        return renderString2(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false);
+        resetStyles();
+        return renderString(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false);
     }
 
     private int drawStringBack(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_) {
         GL11.glEnable(3008);
-        resetStyles2();
-        return renderString2(p_85187_1_, p_85187_2_ + 1, p_85187_3_ + 1, p_85187_4_, true);
+        resetStyles();
+        return renderString(p_85187_1_, p_85187_2_ + 1, p_85187_3_ + 1, p_85187_4_, true);
     }
 
     @Override
-    public int getStringWidth(String p_78256_1_)
-    {
-        if(gameSettings.guiScale==1){
+    public int getStringWidth(String p_78256_1_) {
+        if (Minecraft.getMinecraft().gameSettings.guiScale == 1) {
             return Minecraft.getMinecraft().fontRenderer.getStringWidth(p_78256_1_);
         }
-        if (p_78256_1_ == null)
-        {
+        if (p_78256_1_ == null) {
             return 0;
-        }
-        else
-        {
-            int i = 0;
+        } else {
+            int     i    = 0;
             boolean flag = false;
 
-            for (int j = 0; j < p_78256_1_.length(); ++j)
-            {
+            for (int j = 0; j < p_78256_1_.length(); ++j) {
                 char c0 = p_78256_1_.charAt(j);
-                int k = this.getCharWidth(c0);
+                int  k  = this.getCharWidth(c0);
 
-                if (k < 0 && j < p_78256_1_.length() - 1)
-                {
+                if (k < 0 && j < p_78256_1_.length() - 1) {
                     ++j;
                     c0 = p_78256_1_.charAt(j);
 
-                    if (c0 != 108 && c0 != 76)
-                    {
-                        if (c0 == 114 || c0 == 82)
-                        {
+                    if (c0 != 108 && c0 != 76) {
+                        if (c0 == 114 || c0 == 82) {
                             flag = false;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         flag = true;
                     }
 
@@ -265,8 +350,7 @@ public class TecTechFontRender extends FontRenderer {
 
                 i += k;
 
-                if (flag && k > 0)
-                {
+                if (flag && k > 0) {
                     ++i;
                 }
             }
@@ -274,4 +358,6 @@ public class TecTechFontRender extends FontRenderer {
             return i;
         }
     }
+
+
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 76f4457e94..49fd8b5b54 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -5,8 +5,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
@@ -27,12 +27,17 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE
 import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
 import static gregtech.api.enums.Materials.*;
 import static gregtech.api.enums.OrePrefixes.dust;
+import static java.lang.Math.abs;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 18.11.2016.
  */
 public class EMAtomDefinition extends EMComplexTemplate {
+    private static final String[] SYMBOL       = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
+    private static final String[] NAME         = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+    private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
+
     public static final  long ATOM_COMPLEXITY_LIMIT = 65536L;
     private static final byte BYTE_OFFSET           = 32;
 
@@ -118,7 +123,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
             if (def.getGeneration() < 0) {
                 containsAnti = true;
             }
-            type = Math.max(type, Math.abs(def.getGeneration()));
+            type = Math.max(type, abs(def.getGeneration()));
 
             if (def instanceof EMLeptonDefinition) {
                 cLeptons += stack.getCharge();
@@ -140,12 +145,12 @@ public class EMAtomDefinition extends EMComplexTemplate {
         this.neutralCount = neutralCount;
         this.element = element;
 
-        element = Math.abs(element);
+        element = abs(element);
 
         //stability curve
         int StableIsotope = stableIzoCurve(element);
         int izoDiff       = neutralCount - StableIsotope;
-        int izoDiffAbs    = Math.abs(izoDiff);
+        int izoDiffAbs    = abs(izoDiff);
 
         xstr.setSeed((element + 1L) * (neutralCount + 100L));
         iaea = EMNuclideIAEA.get(element, neutralCount);
@@ -215,7 +220,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
             if (element == 0) {
                 return 1e-35D;
             } else if (element == 1) {
-                unstabilityEXP = 1.743D - Math.abs(izoDiff - 1) * 9.743D;
+                unstabilityEXP = 1.743D - abs(izoDiff - 1) * 9.743D;
             } else if (element == 2) {
                 switch (isotope) {
                     case 4:
@@ -234,9 +239,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
             } else if (element <= 83 || isotope <= 127 && element <= 120) {
                 double elementPow4 = Math.pow(element, 4);
 
-                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - Math.abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
+                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
             } else if (element < 180) {
-                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - Math.abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
+                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
             } else {
                 return -1;
             }
@@ -334,63 +339,51 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public String getLocalizedName() {
-        int     element  = Math.abs(this.getElement());
-        boolean negative = this.getElement() < 0;
-        try {
-            if (Math.abs(getGeneration()) != 1) {
-                return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
-            }
-            return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
+        int     element  = abs(this.getElement());
+        boolean anti = this.getElement() < 0;
+        boolean weird = abs(getGeneration()) != 1;
+        if(element>=NAME.length){
+            StringBuilder s = new StringBuilder();
+            if(anti){
+                s.append(translateToLocal("tt.IUPAC.Anti"));
+                do {
+                    s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element % 10]));
+                    element = element / 10;
+                } while (element > 0);
+            }else {
+                while (element >= 10) {
+                    s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element % 10]));
+                    element = element / 10;
+                }
+                s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element + 10]));
             }
-            return translateToLocal("tt.keyword.Element") + (negative ? ": ~" : ": ") + element;
+            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            return s.toString();
         }
+        return translateToLocal("tt.element."+(anti?"Anti":"")+NAME[element])+(weird?translateToLocal("tt.keyword.Weird"):"");
     }
 
     @Override
     public String getSymbol() {
-        int     element  = Math.abs(this.getElement());
-        boolean negative = this.getElement() < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
-            }
-        }
+        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
     }
 
     @Override
     public String getShortSymbol() {
-        int     element  = Math.abs(this.getElement());
-        boolean negative = this.getElement() < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1];
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "?";
-            }
+        int     element  = abs(this.getElement());
+        boolean anti = this.getElement() < 0;
+        boolean weird = abs(getGeneration()) != 1;
+        if(element>=SYMBOL.length){
+            StringBuilder s = new StringBuilder(anti?"~":"");
+            while (element >= 10) {
+                s.append(SYMBOL_IUPAC[element % 10]);
+                element = element / 10;
+            }
+            s.append(SYMBOL_IUPAC[element + 10]);
+            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            return s.toString();
         }
+        return (anti?"~":"")+SYMBOL[element]+(weird?translateToLocal("tt.keyword.Weird"):"");
     }
 
     @Override
@@ -1133,7 +1126,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     private boolean Fission(ArrayList<EMDecay> decaysList, EMDefinitionStackMap fissile, EMDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
         EMDefinitionStackMap heavy      = new EMDefinitionStackMap();
-        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement()) <= 97);
+        double[]             liquidDrop = liquidDropFunction(abs(getElement()) <= 97);
 
         for (EMDefinitionStack stack : fissile.valuesToArray()) {
             if (spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
@@ -1226,7 +1219,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 return decays.toArray(EMDecay.NO_PRODUCT);
             }
         }
-        if (energyLevel < Math.abs(getCharge()) / 3 + getNeutralCount()) {
+        if (energyLevel < abs(getCharge()) / 3 + getNeutralCount()) {
             return new EMDecay[]{new EMDecay(1, this, boson_Y__)};
         }
         return getNaturalDecayInstant();
@@ -1363,12 +1356,6 @@ public class EMAtomDefinition extends EMComplexTemplate {
         return element;
     }
 
-    private static final class Nomenclature {
-        private static final String[] SYMBOL       = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
-        private static final String[] NAME         = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
-        private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
-    }
-
     @Override
     protected String getIndirectTagValue() {
         return nbtType;
@@ -1398,7 +1385,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 //stability curve
                 int           StableIsotope = stableIzoCurve(element);
                 int           izoDiff       = isotope - StableIsotope;
-                int           izoDiffAbs    = Math.abs(izoDiff);
+                int           izoDiffAbs    = abs(izoDiff);
                 double        rawLifeTime   = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
                 EMNuclideIAEA nuclide       = EMNuclideIAEA.get(element, isotope);
                 if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.getHalfTime() >= STABLE_RAW_LIFE_TIME) {
@@ -1415,7 +1402,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 //stability curve
                 int                      Isotope     = stableIzoCurve(element);
                 int                      izoDiff     = isotope - Isotope;
-                int                      izoDiffAbs  = Math.abs(izoDiff);
+                int                      izoDiffAbs  = abs(izoDiff);
                 double                   rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
                 TreeMap<Double, Integer> isotopes    = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
                 isotopes.put(rawLifeTime, isotope);//todo dont add stable ones
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index ecebc6afcd..b8ce40b180 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -141,9 +141,12 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
         for(IEMDefinition definition: TecTech.definitionsRegistry.getStacksRegisteredForDisplay()){
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.itemMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1000+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.mbMols")),
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.itemMols")),
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1000+" "+translateToLocal("tt.keyword.mbMols")),
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k))));
         }
     }
 
diff --git a/src/main/resources/META-INF/tectech_at.cfg b/src/main/resources/META-INF/tectech_at.cfg
index e09e575a7d..fa76d13c1f 100644
--- a/src/main/resources/META-INF/tectech_at.cfg
+++ b/src/main/resources/META-INF/tectech_at.cfg
@@ -1,2 +1,17 @@
 public net.minecraft.block.Block field_149781_w #blockResistance
-public net.minecraft.block.Block field_149782_v #blockHardness
\ No newline at end of file
+public net.minecraft.block.Block field_149782_v #blockHardness
+protected net.minecraft.client.gui.FontRenderer field_111274_c #unicodePageLocations
+protected net.minecraft.client.gui.FontRenderer field_78285_g #colorCode
+protected net.minecraft.client.gui.FontRenderer field_78298_i #renderEngine
+protected net.minecraft.client.gui.FontRenderer field_78293_l #unicodeFlag
+protected net.minecraft.client.gui.FontRenderer field_78294_m #bidiFlag
+protected net.minecraft.client.gui.FontRenderer field_78291_n #red
+protected net.minecraft.client.gui.FontRenderer field_78292_o #blue
+protected net.minecraft.client.gui.FontRenderer field_78306_p #green
+protected net.minecraft.client.gui.FontRenderer field_78305_q #alpha
+protected net.minecraft.client.gui.FontRenderer field_78304_r #textColor
+protected net.minecraft.client.gui.FontRenderer field_78303_s #randomStyle
+protected net.minecraft.client.gui.FontRenderer field_78302_t #boldStyle
+protected net.minecraft.client.gui.FontRenderer field_78301_u #italicStyle
+protected net.minecraft.client.gui.FontRenderer field_78300_v #underlineStyle
+protected net.minecraft.client.gui.FontRenderer field_78299_w #strikethroughStyle
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index f69f250e78..7924545051 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -948,8 +948,266 @@ tt.keyword.Chaos=Chaos
 tt.keyword.Primal=Primal
 tt.keyword.Aspect=Aspect
 
-
-
-
-
-
+tt.element.Neutronium=Neutronium
+tt.element.Hydrogen=Hydrogen
+tt.element.Helium=Helium
+tt.element.Lithium=Lithium
+tt.element.Beryllium=Beryllium
+tt.element.Boron=Boron
+tt.element.Carbon=Carbon
+tt.element.Nitrogen=Nitrogen
+tt.element.Oxygen=Oxygen
+tt.element.Fluorine=Fluorine
+tt.element.Neon=Neon
+tt.element.Sodium=Sodium
+tt.element.Magnesium=Magnesium
+tt.element.Aluminium=Aluminium
+tt.element.Silicon=Silicon
+tt.element.Phosphorus=Phosphorus
+tt.element.Sulfur=Sulfur
+tt.element.Chlorine=Chlorine
+tt.element.Argon=Argon
+tt.element.Potassium=Potassium
+tt.element.Calcium=Calcium
+tt.element.Scandium=Scandium
+tt.element.Titanium=Titanium
+tt.element.Vanadium=Vanadium
+tt.element.Chromium=Chromium
+tt.element.Manganese=Manganese
+tt.element.Iron=Iron
+tt.element.Cobalt=Cobalt
+tt.element.Nickel=Nickel
+tt.element.Copper=Copper
+tt.element.Zinc=Zinc
+tt.element.Gallium=Gallium
+tt.element.Germanium=Germanium
+tt.element.Arsenic=Arsenic
+tt.element.Selenium=Selenium
+tt.element.Bromine=Bromine
+tt.element.Krypton=Krypton
+tt.element.Rubidium=Rubidium
+tt.element.Strontium=Strontium
+tt.element.Yttrium=Yttrium
+tt.element.Zirconium=Zirconium
+tt.element.Niobium=Niobium
+tt.element.Molybdenum=Molybdenum
+tt.element.Technetium=Technetium
+tt.element.Ruthenium=Ruthenium
+tt.element.Rhodium=Rhodium
+tt.element.Palladium=Palladium
+tt.element.Silver=Silver
+tt.element.Cadmium=Cadmium
+tt.element.Indium=Indium
+tt.element.Tin=Tin
+tt.element.Antimony=Antimony
+tt.element.Tellurium=Tellurium
+tt.element.Iodine=Iodine
+tt.element.Xenon=Xenon
+tt.element.Caesium=Caesium
+tt.element.Barium=Barium
+tt.element.Lanthanum=Lanthanum
+tt.element.Cerium=Cerium
+tt.element.Praseodymium=Praseodymium
+tt.element.Neodymium=Neodymium
+tt.element.Promethium=Promethium
+tt.element.Samarium=Samarium
+tt.element.Europium=Europium
+tt.element.Gadolinium=Gadolinium
+tt.element.Terbium=Terbium
+tt.element.Dysprosium=Dysprosium
+tt.element.Holmium=Holmium
+tt.element.Erbium=Erbium
+tt.element.Thulium=Thulium
+tt.element.Ytterbium=Ytterbium
+tt.element.Lutetium=Lutetium
+tt.element.Hafnium=Hafnium
+tt.element.Tantalum=Tantalum
+tt.element.Tungsten=Tungsten
+tt.element.Rhenium=Rhenium
+tt.element.Osmium=Osmium
+tt.element.Iridium=Iridium
+tt.element.Platinum=Platinum
+tt.element.Gold=Gold
+tt.element.Mercury=Mercury
+tt.element.Thallium=Thallium
+tt.element.Lead=Lead
+tt.element.Bismuth=Bismuth
+tt.element.Polonium=Polonium
+tt.element.Astatine=Astatine
+tt.element.Radon=Radon
+tt.element.Francium=Francium
+tt.element.Radium=Radium
+tt.element.Actinium=Actinium
+tt.element.Thorium=Thorium
+tt.element.Protactinium=Protactinium
+tt.element.Uranium=Uranium
+tt.element.Neptunium=Neptunium
+tt.element.Plutonium=Plutonium
+tt.element.Americium=Americium
+tt.element.Curium=Curium
+tt.element.Berkelium=Berkelium
+tt.element.Californium=Californium
+tt.element.Einsteinium=Einsteinium
+tt.element.Fermium=Fermium
+tt.element.Mendelevium=Mendelevium
+tt.element.Nobelium=Nobelium
+tt.element.Lawrencium=Lawrencium
+tt.element.Rutherfordium=Rutherfordium
+tt.element.Dubnium=Dubnium
+tt.element.Seaborgium=Seaborgium
+tt.element.Bohrium=Bohrium
+tt.element.Hassium=Hassium
+tt.element.Meitnerium=Meitnerium
+tt.element.Darmstadtium=Darmstadtium
+tt.element.Roentgenium=Roentgenium
+tt.element.Copernicium=Copernicium
+tt.element.Nihonium=Nihonium
+tt.element.Flerovium=Flerovium
+tt.element.Moscovium=Moscovium
+tt.element.Livermorium=Livermorium
+tt.element.Tennessine=Tennessine
+tt.element.Oganesson=Oganesson
+
+tt.element.AntiNeutronium=Antineutronium
+tt.element.AntiHydrogen=Antihydrogen
+tt.element.AntiHelium=Antihelium
+tt.element.AntiLithium=Antilithium
+tt.element.AntiBeryllium=Antiberyllium
+tt.element.AntiBoron=Antiboron
+tt.element.AntiCarbon=Anticarbon
+tt.element.AntiNitrogen=Antinitrogen
+tt.element.AntiOxygen=Antioxygen
+tt.element.AntiFluorine=Antifluorine
+tt.element.AntiNeon=Antineon
+tt.element.AntiSodium=Antisodium
+tt.element.AntiMagnesium=Antimagnesium
+tt.element.AntiAluminium=Antialuminium
+tt.element.AntiSilicon=Antisilicon
+tt.element.AntiPhosphorus=Antiphosphorus
+tt.element.AntiSulfur=Antisulfur
+tt.element.AntiChlorine=Antichlorine
+tt.element.AntiArgon=Antiargon
+tt.element.AntiPotassium=Antipotassium
+tt.element.AntiCalcium=Anticalcium
+tt.element.AntiScandium=Antiscandium
+tt.element.AntiTitanium=Antititanium
+tt.element.AntiVanadium=Antivanadium
+tt.element.AntiChromium=Antichromium
+tt.element.AntiManganese=Antimanganese
+tt.element.AntiIron=Antiiron
+tt.element.AntiCobalt=Anticobalt
+tt.element.AntiNickel=Antinickel
+tt.element.AntiCopper=Anticopper
+tt.element.AntiZinc=Antizinc
+tt.element.AntiGallium=Antigallium
+tt.element.AntiGermanium=Antigermanium
+tt.element.AntiArsenic=Antiarsenic
+tt.element.AntiSelenium=Antiselenium
+tt.element.AntiBromine=Antibromine
+tt.element.AntiKrypton=Antikrypton
+tt.element.AntiRubidium=Antirubidium
+tt.element.AntiStrontium=Antistrontium
+tt.element.AntiYttrium=Antiyttrium
+tt.element.AntiZirconium=Antizirconium
+tt.element.AntiNiobium=Antiniobium
+tt.element.AntiMolybdenum=Antimolybdenum
+tt.element.AntiTechnetium=Antitechnetium
+tt.element.AntiRuthenium=Antiruthenium
+tt.element.AntiRhodium=Antirhodium
+tt.element.AntiPalladium=Antipalladium
+tt.element.AntiSilver=Antisilver
+tt.element.AntiCadmium=Anticadmium
+tt.element.AntiIndium=Antiindium
+tt.element.AntiTin=Antitin
+tt.element.AntiAntimony=Antiantimony
+tt.element.AntiTellurium=Antitellurium
+tt.element.AntiIodine=Antiiodine
+tt.element.AntiXenon=Antixenon
+tt.element.AntiCaesium=Anticaesium
+tt.element.AntiBarium=Antibarium
+tt.element.AntiLanthanum=Antilanthanum
+tt.element.AntiCerium=Anticerium
+tt.element.AntiPraseodymium=Antipraseodymium
+tt.element.AntiNeodymium=Antineodymium
+tt.element.AntiPromethium=Antipromethium
+tt.element.AntiSamarium=Antisamarium
+tt.element.AntiEuropium=Antieuropium
+tt.element.AntiGadolinium=Antigadolinium
+tt.element.AntiTerbium=Antiterbium
+tt.element.AntiDysprosium=Antidysprosium
+tt.element.AntiHolmium=Antiholmium
+tt.element.AntiErbium=Antierbium
+tt.element.AntiThulium=Antithulium
+tt.element.AntiYtterbium=Antiytterbium
+tt.element.AntiLutetium=Antilutetium
+tt.element.AntiHafnium=Antihafnium
+tt.element.AntiTantalum=Antitantalum
+tt.element.AntiTungsten=Antitungsten
+tt.element.AntiRhenium=Antirhenium
+tt.element.AntiOsmium=Antiosmium
+tt.element.AntiIridium=Antiiridium
+tt.element.AntiPlatinum=Antiplatinum
+tt.element.AntiGold=Antigold
+tt.element.AntiMercury=Antimercury
+tt.element.AntiThallium=Antithallium
+tt.element.AntiLead=Antilead
+tt.element.AntiBismuth=Antibismuth
+tt.element.AntiPolonium=Antipolonium
+tt.element.AntiAstatine=Antiastatine
+tt.element.AntiRadon=Antiradon
+tt.element.AntiFrancium=Antifrancium
+tt.element.AntiRadium=Antiradium
+tt.element.AntiActinium=Antiactinium
+tt.element.AntiThorium=Antithorium
+tt.element.AntiProtactinium=Antiprotactinium
+tt.element.AntiUranium=Antiuranium
+tt.element.AntiNeptunium=Antineptunium
+tt.element.AntiPlutonium=Antiplutonium
+tt.element.AntiAmericium=Antiamericium
+tt.element.AntiCurium=Anticurium
+tt.element.AntiBerkelium=Antiberkelium
+tt.element.AntiCalifornium=Antibalifornium
+tt.element.AntiEinsteinium=Antieinsteinium
+tt.element.AntiFermium=Antifermium
+tt.element.AntiMendelevium=Antimendelevium
+tt.element.AntiNobelium=Antinobelium
+tt.element.AntiLawrencium=Antilawrencium
+tt.element.AntiRutherfordium=Antirutherfordium
+tt.element.AntiDubnium=Antidubnium
+tt.element.AntiSeaborgium=Antiseaborgium
+tt.element.AntiBohrium=Antibohrium
+tt.element.AntiHassium=Antihassium
+tt.element.AntiMeitnerium=Antimeitnerium
+tt.element.AntiDarmstadtium=Antidarmstadtium
+tt.element.AntiRoentgenium=Antiroentgenium
+tt.element.AntiCopernicium=Anticopernicium
+tt.element.AntiNihonium=Antinihonium
+tt.element.AntiFlerovium=Antiflerovium
+tt.element.AntiMoscovium=Antimoscovium
+tt.element.AntiLivermorium=Antilivermorium
+tt.element.AntiTennessine=Antitennessine
+tt.element.AntiOganesson=Antioganesson
+
+tt.IUPAC.n=nil
+tt.IUPAC.u=un
+tt.IUPAC.b=bi
+tt.IUPAC.t=tri
+tt.IUPAC.q=quad
+tt.IUPAC.p=pent
+tt.IUPAC.h=hex
+tt.IUPAC.s=sept
+tt.IUPAC.o=oct
+tt.IUPAC.e=enn
+tt.IUPAC.N=Nil
+tt.IUPAC.U=Un
+tt.IUPAC.B=Bi
+tt.IUPAC.T=Tri
+tt.IUPAC.Q=Quad
+tt.IUPAC.P=Pent
+tt.IUPAC.H=Hex
+tt.IUPAC.S=Sept
+tt.IUPAC.O=Oct
+tt.IUPAC.E=Enn
+tt.IUPAC.ium=ium
+tt.IUPAC.Anti=Anti
+tt.keyword.Weird=*
\ No newline at end of file
-- 
cgit 


From ac8311109c91731598466dbd9068f8c995b1d760 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 27 Jan 2022 22:09:30 +0100
Subject: Cleanup Atoms Localization, and FontRenderer

---
 .../elementalMatter/definitions/complex/EMAtomDefinition.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 49fd8b5b54..03aae39578 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -357,7 +357,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 }
                 s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element + 10]));
             }
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return translateToLocal("tt.element."+(anti?"Anti":"")+NAME[element])+(weird?translateToLocal("tt.keyword.Weird"):"");
@@ -380,7 +382,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 element = element / 10;
             }
             s.append(SYMBOL_IUPAC[element + 10]);
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return (anti?"~":"")+SYMBOL[element]+(weird?translateToLocal("tt.keyword.Weird"):"");
-- 
cgit 


From d0a419301b457b49ba09f8f4c430ac814f853a5c Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 5 Dec 2021 09:03:50 +0100
Subject: Fix Junctions

(cherry picked from commit ebd719987402bb4a60bf01a10f5b8e1480184f69)
---
 .../thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index 53cf072293..7d0ee03320 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -68,7 +68,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                 v = (int) v;
                 if (v < 0) return STATUS_TOO_LOW;
                 if (v == 0) return STATUS_NEUTRAL;
-                if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH;
+                if (v > base.eOutputHatches.size()) return STATUS_TOO_HIGH;
                 return STATUS_OK;
             };
     private static final IStatusFunction<GT_MetaTileEntity_EM_junction> DST_STATUS =
@@ -79,7 +79,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                     v = (int) v;
                     if (v < 0) return STATUS_TOO_LOW;
                     if (v == 0) return STATUS_LOW;
-                    if (v >= base.eInputHatches.size()) return STATUS_TOO_HIGH;
+                    if (v > base.eInputHatches.size()) return STATUS_TOO_HIGH;
                     return STATUS_OK;
                 }
                 return STATUS_NEUTRAL;
-- 
cgit 


From f2bf25053f9d4d576aa0624b80c35d8bfa3efb70 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sat, 8 Jan 2022 21:16:46 +0100
Subject: Add aspect EM containers to creative tab

(cherry picked from commit bb064e24a37791838c49f5db2537acfe3cfbc36f)
---
 .../thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java | 2 +-
 .../elementalMatter/definitions/AspectDefinitionCompatEnabled.java     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
index 2d531858d0..c3231e6132 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
@@ -11,7 +11,7 @@ import java.util.HashMap;
  */
 public class AspectDefinitionCompat {
     public static AspectDefinitionCompat aspectDefinitionCompat;
-    static final HashMap<cElementalDefinition,String> defToAspect = new HashMap<>();
+    public static final HashMap<cElementalDefinition,String> defToAspect = new HashMap<>();
     public static final HashMap<String,cElementalDefinition> aspectToDef = new HashMap<>();
 
     public void run(){}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
index da930a1d79..3cb2eafccd 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
@@ -8,6 +8,7 @@ import thaumcraft.api.aspects.Aspect;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
 
 /**
  * Created by Tec on 21.05.2017.
@@ -58,6 +59,8 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                 }
             }
         }
+
+        STACKS_REGISTERED.addAll(defToAspect.keySet());
     }
 
     @Override
-- 
cgit 


From 5bb0894b4c54cd10e987493ad3402ad9522407db Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 9 Jan 2022 19:19:04 +0100
Subject: Cleanup and update EM turret projectile

(cherry picked from commit de8bf3e68e9e4d7cee485d0d6951a4e4ccb5859d)
---
 .../entity/projectiles/projectileEM.java           | 55 +++++++++-------------
 .../tileentity/turret/TileTurretHeadEM.java        | 19 +++++++-
 .../core/transformations/bTransformationInfo.java  |  7 ++-
 .../item/DebugElementalInstanceContainer_EM.java   |  5 +-
 4 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index 702ed77315..92acd71ecd 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -18,6 +18,8 @@ import openmodularturrets.tileentity.turretbase.TurretBase;
 import openmodularturrets.util.PlayerUtil;
 import openmodularturrets.util.TurretHeadUtil;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+
 
 /**
  * Created by Bass on 27/07/2017.
@@ -26,7 +28,7 @@ public class projectileEM extends LaserProjectile {
     public float gravity=0;
     private TurretBase turretBase;
 
-    private boolean exotic, antiMatter,isAmped;
+    private boolean strange, antiMatter,isAmped;
 
     private int ampLevel;
 
@@ -45,36 +47,23 @@ public class projectileEM extends LaserProjectile {
         }
     }
 
-    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStackMap avalableEM) {
+    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStack projectileContent) {
         super(par1World, turretBase);
         this.turretBase = turretBase;
-        boolean onlyQuarks=true;
-        if(avalableEM!=null && avalableEM.hasStacks()) {
-            for (cElementalInstanceStack stack : avalableEM.values()) {
-                if (!(stack.definition instanceof eQuarkDefinition)) {
-                    onlyQuarks = false;
-                }
-            }
-            if (onlyQuarks) {
-                avalableEM.clear();
-            } else {
-                cElementalInstanceStack consumeFromThis=avalableEM.get(TecTech.RANDOM.nextInt(avalableEM.size()));
-                massFactor =(float) (consumeFromThis.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
+        if(projectileContent != null){
+            massFactor =(float) (projectileContent.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
 
-                if(consumeFromThis.definition.getType()>1 || consumeFromThis.definition.getType()<-1) {
-                    exotic = true;
-                }
-                if(consumeFromThis.definition.getType()<0) {
-                    antiMatter = true;
-                }
-
-                if (consumeFromThis.definition.getCharge() == 0) {
-                    gravity = massFactor / 100f;
-                } else {
-                    gravity = Math.min(0.0025F / Math.abs(consumeFromThis.definition.getCharge()), massFactor / 100f);
-                }
+            if(projectileContent.definition.getType()>1 || projectileContent.definition.getType()<-1) {
+                strange = true;
+            }
+            if(projectileContent.definition.getType()<0) {
+                antiMatter = true;
+            }
 
-                avalableEM.removeAmount(false,consumeFromThis.definition.getStackForm(1));
+            if (projectileContent.definition.getCharge() == 0) {
+                gravity = massFactor / 100f;
+            } else {
+                gravity = Math.min(0.0025F / Math.abs(projectileContent.definition.getCharge()), massFactor / 100f);
             }
         }
         //todo make the recipe require some overflow hatches
@@ -97,7 +86,8 @@ public class projectileEM extends LaserProjectile {
                         worldObj.createExplosion(null,
                                 movingobjectposition.blockX + 0.5D,
                                 movingobjectposition.blockY + 0.5D,
-                                movingobjectposition.blockZ + 0.5D, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
+                                movingobjectposition.blockZ + 0.5D,
+                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                     } else {
                         return;
                     }
@@ -107,18 +97,18 @@ public class projectileEM extends LaserProjectile {
             if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
                 worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.RANDOM.nextFloat() + 0.5F);
                 if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
-                    float damage = (exotic?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
+                    float damage = (strange ?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
 
                     if(movingobjectposition.entityHit instanceof EntityPlayer) {
                         if(canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) {
-                            movingobjectposition.entityHit.setFire((exotic?10:1)*2);
+                            movingobjectposition.entityHit.setFire((strange ?10:1)*2);
                             movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
                             if(antiMatter) {
                                 movingobjectposition.entityHit.hurtResistantTime = 0;
                             }
                         }
                     } else {
-                        movingobjectposition.entityHit.setFire((exotic?10:1)*2);
+                        movingobjectposition.entityHit.setFire((strange ?10:1)*2);
                         movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
                         if(antiMatter) {
                             movingobjectposition.entityHit.hurtResistantTime = 0;
@@ -133,7 +123,8 @@ public class projectileEM extends LaserProjectile {
                         worldObj.createExplosion(null,
                                 movingobjectposition.entityHit.posX,
                                 movingobjectposition.entityHit.posY,
-                                movingobjectposition.entityHit.posZ, (exotic?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
+                                movingobjectposition.entityHit.posZ,
+                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                     }
                 }
             }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 2de6b39c4c..1c8d476a36 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -1,8 +1,12 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret;
 
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -13,6 +17,8 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
+
 /**
  * Created by Bass on 27/07/2017.
  */
@@ -64,7 +70,18 @@ public class TileTurretHeadEM extends TurretHead{
 
     @Override
     public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) {
-        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), hatchContentPointer);
+        while(hatchContentPointer!=null && hatchContentPointer.hasStacks()) {
+            cElementalInstanceStack stack = hatchContentPointer.get(TecTech.RANDOM.nextInt(hatchContentPointer.size()));
+            if(stack.amount<AVOGADRO_CONSTANT_KIND_OF_SMALLER){
+                hatchContentPointer.remove(stack.definition);
+                continue;
+            }
+            hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+            stack=stack.clone();
+            stack.amount = AVOGADRO_CONSTANT;
+            return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
+        }
+        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
index 55ee24e2f6..ec5391a0b4 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformation
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.util.DoubleCount;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraft.item.ItemStack;
@@ -20,8 +21,12 @@ import static com.github.technus.tectech.thing.item.DebugElementalInstanceContai
  */
 public class bTransformationInfo {
     public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000)/6.02214076e23D;
+    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000)/AVOGADRO_CONSTANT;
+    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / (144 * 1000);
+    public static final double AVOGADRO_CONSTANT_KIND_OF_SMALLER =AVOGADRO_CONSTANT-AVOGADRO_CONSTANT_EPSILON;
+    public static final double AVOGADRO_CONSTANT_KIND_OF_BIGGER =AVOGADRO_CONSTANT+AVOGADRO_CONSTANT_EPSILON;
     public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
+    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
 
     public static final Map<Integer,aFluidQuantizationInfo> fluidQuantization=new HashMap<>(32);
     public static final Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization=new HashMap<>(32);
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index 6850b24e0f..bfd7d266c0 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -31,8 +31,7 @@ import java.util.TreeSet;
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -145,7 +144,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         for(iElementalDefinition definition: STACKS_REGISTERED){
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT))));
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 144 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_144))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1000 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT *1000))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1000 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
         }
     }
 
-- 
cgit 


From 91ca8b69b5e2a9610411a5e6b1fac66d3663de15 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 13 Jan 2022 22:27:27 +0100
Subject: cherry pick This should make the EM anomaly and projectile as it was

---
 .../tectech/compatibility/gtpp/GtppAtomLoader.java |  53 ++---
 .../openComputers/AvrArchitecture.java             |   2 +-
 .../entity/projectiles/projectileEM.java           | 105 ++++-----
 .../tileentity/turret/TileTurretHeadEM.java        |  11 +-
 .../definitions/AspectDefinitionCompat.java        |  30 ---
 .../definitions/AspectDefinitionCompatEnabled.java |  81 -------
 .../definitions/dComplexAspectDefinition.java      |   8 +-
 .../definitions/ePrimalAspectDefinition.java       |   7 +-
 .../definitions/iElementalAspect.java              |   8 -
 .../transformations/AspectDefinitionCompat.java    |  29 +++
 .../AspectDefinitionCompatEnabled.java             |  81 +++++++
 .../thing/metaTileEntity/multi/EssentiaCompat.java |  10 +-
 .../multi/EssentiaCompatEnabled.java               |  33 +--
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  | 126 +++++++----
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |  69 +++---
 .../github/technus/tectech/loader/MainLoader.java  |   6 +-
 .../tectech/loader/thing/MachineLoader.java        |  13 +-
 .../tectech/mechanics/anomaly/AnomalyHandler.java  | 247 +++++++++++++--------
 .../tectech/mechanics/anomaly/CancerCommand.java   |  10 +-
 .../tectech/mechanics/anomaly/ChargeCommand.java   |  10 +-
 .../core/transformations/bTransformationInfo.java  |  53 +++--
 .../definitions/complex/dAtomDefinition.java       | 163 +++++++-------
 .../definitions/complex/dHadronDefinition.java     |   4 +-
 .../GT_MetaTileEntity_Hatch_OverflowElemental.java |  10 +-
 .../multi/GT_MetaTileEntity_EM_decay.java          |   2 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |  61 +++--
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |   2 +-
 .../thing/tileEntity/ReactorSimTileEntity.java     |   2 +-
 28 files changed, 657 insertions(+), 579 deletions(-)
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java

diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index bf96d61795..72cee6d7aa 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.compatibility.gtpp;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -66,34 +67,34 @@ public class GtppAtomLoader implements Runnable{
         }
         //endregion
 
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
         generate("GERMANIUM",true,true);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
 
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
 
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java
index 2842a71df3..595d814fc5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openComputers/AvrArchitecture.java
@@ -21,7 +21,7 @@ import li.cil.oc.api.machine.Signal;
 import li.cil.oc.common.SaveHandler;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import org.apache.commons.io.IOUtils;
+import org.apache.commons.compress.utils.IOUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index 92acd71ecd..a0b6106151 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -1,10 +1,8 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -18,8 +16,6 @@ import openmodularturrets.tileentity.turretbase.TurretBase;
 import openmodularturrets.util.PlayerUtil;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-
 
 /**
  * Created by Bass on 27/07/2017.
@@ -33,6 +29,7 @@ public class projectileEM extends LaserProjectile {
     private int ampLevel;
 
     private float massFactor;
+    private double mass,charge;
 
     public projectileEM(World par1World) {
         super(par1World);
@@ -51,6 +48,8 @@ public class projectileEM extends LaserProjectile {
         super(par1World, turretBase);
         this.turretBase = turretBase;
         if(projectileContent != null){
+            mass=projectileContent.getMass();
+            charge=projectileContent.getCharge();
             massFactor =(float) (projectileContent.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
 
             if(projectileContent.definition.getType()>1 || projectileContent.definition.getType()<-1) {
@@ -66,66 +65,70 @@ public class projectileEM extends LaserProjectile {
                 gravity = Math.min(0.0025F / Math.abs(projectileContent.definition.getCharge()), massFactor / 100f);
             }
         }
-        //todo make the recipe require some overflow hatches
-
-        //todo add more subspace pollution
     }
 
     @Override
     protected void onImpact(MovingObjectPosition movingobjectposition) {
         if(ticksExisted > 1) {
-            if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
-                Block hitBlock = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ);
-                if(hitBlock != null){
-                    if (hitBlock.getMaterial().isSolid() && TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) {
-                        worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.RANDOM.nextFloat() + 0.5F);
-                        GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
-                                movingobjectposition.blockX,
-                                movingobjectposition.blockY,
-                                movingobjectposition.blockZ);
-                        worldObj.createExplosion(null,
-                                movingobjectposition.blockX + 0.5D,
-                                movingobjectposition.blockY + 0.5D,
-                                movingobjectposition.blockZ + 0.5D,
-                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
-                    } else {
-                        return;
-                    }
-                }
-            }
-
-            if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
+            if(!worldObj.isRemote){
                 worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.RANDOM.nextFloat() + 0.5F);
-                if(movingobjectposition.entityHit != null && !worldObj.isRemote) {
-                    float damage = (strange ?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
-
-                    if(movingobjectposition.entityHit instanceof EntityPlayer) {
-                        if(canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) {
+                switch (movingobjectposition.typeOfHit){
+                    case BLOCK:
+                        Block hitBlock = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ);
+                        if(hitBlock != null){
+                            if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter && hitBlock.getMaterial().isSolid()) {
+                                GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
+                                        movingobjectposition.blockX,
+                                        movingobjectposition.blockY,
+                                        movingobjectposition.blockZ);
+                                worldObj.createExplosion(null,
+                                        movingobjectposition.blockX + 0.5D,
+                                        movingobjectposition.blockY + 0.5D,
+                                        movingobjectposition.blockZ + 0.5D,
+                                        TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * (strange ? 10 : 1) * massFactor * (isAmped ? ampLevel * .1f + 1 : 1) * (ticksExisted / 250f), true);
+                            } else {
+                                return;
+                            }
+                        }
+                        break;
+                    case ENTITY:
+                        float damage = (strange ?10:1) * TecTech.configTecTech.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1);
+
+                        if(movingobjectposition.entityHit instanceof EntityPlayer) {
+                            EntityPlayer player=(EntityPlayer)movingobjectposition.entityHit;
+                            if(canDamagePlayer(player)) {
+                                movingobjectposition.entityHit.setFire((strange ?10:1)*2);
+                                movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
+                                if(antiMatter) {
+                                    movingobjectposition.entityHit.hurtResistantTime = 0;
+                                }
+                                if(strange){
+                                    TecTech.anomalyHandler.addCancer(player,mass);
+                                }
+                                if(charge!=0) {
+                                    TecTech.anomalyHandler.addCharge(player,charge);
+                                }
+                            }
+                        } else {
                             movingobjectposition.entityHit.setFire((strange ?10:1)*2);
                             movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
                             if(antiMatter) {
                                 movingobjectposition.entityHit.hurtResistantTime = 0;
                             }
                         }
-                    } else {
-                        movingobjectposition.entityHit.setFire((strange ?10:1)*2);
-                        movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage);
-                        if(antiMatter) {
-                            movingobjectposition.entityHit.hurtResistantTime = 0;
+
+                        if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) {
+                            GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
+                                    (int)movingobjectposition.entityHit.posX,
+                                    (int)movingobjectposition.entityHit.posY,
+                                    (int)movingobjectposition.entityHit.posZ);
+                            worldObj.createExplosion(null,
+                                    movingobjectposition.entityHit.posX,
+                                    movingobjectposition.entityHit.posY,
+                                    movingobjectposition.entityHit.posZ,
+                                    (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
                         }
-                    }
-
-                    if (TecTech.configTecTech.ENABLE_TURRET_EXPLOSIONS && antiMatter) {
-                        GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F,
-                                (int)movingobjectposition.entityHit.posX,
-                                (int)movingobjectposition.entityHit.posY,
-                                (int)movingobjectposition.entityHit.posZ);
-                        worldObj.createExplosion(null,
-                                movingobjectposition.entityHit.posX,
-                                movingobjectposition.entityHit.posY,
-                                movingobjectposition.entityHit.posZ,
-                                (strange ?10:1) * TecTech.configTecTech.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? ampLevel*.1f +1:1) * (ticksExisted/250f), true);
-                    }
+                        break;
                 }
             }
             setDead();
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 1c8d476a36..fd039a0630 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -5,8 +5,6 @@ import com.github.technus.tectech.compatibility.openmodularturrets.entity.projec
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -17,7 +15,8 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
 
 /**
  * Created by Bass on 27/07/2017.
@@ -72,8 +71,8 @@ public class TileTurretHeadEM extends TurretHead{
     public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) {
         while(hatchContentPointer!=null && hatchContentPointer.hasStacks()) {
             cElementalInstanceStack stack = hatchContentPointer.get(TecTech.RANDOM.nextInt(hatchContentPointer.size()));
-            if(stack.amount<AVOGADRO_CONSTANT_KIND_OF_SMALLER){
-                hatchContentPointer.remove(stack.definition);
+            if(stack.amount<AVOGADRO_CONSTANT_DIMINISHED){
+                TecTech.anomalyHandler.addAnomaly(this,hatchContentPointer.remove(stack.definition).getMass());//todo reduce
                 continue;
             }
             hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
@@ -82,6 +81,8 @@ public class TileTurretHeadEM extends TurretHead{
             return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
         }
         return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
+
+        //todo make the recipe require some overflow hatches
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
deleted file mode 100644
index c3231e6132..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompat.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import java.util.HashMap;
-
-/**
- * Created by Tec on 21.05.2017.
- */
-public class AspectDefinitionCompat {
-    public static AspectDefinitionCompat aspectDefinitionCompat;
-    public static final HashMap<cElementalDefinition,String> defToAspect = new HashMap<>();
-    public static final HashMap<String,cElementalDefinition> aspectToDef = new HashMap<>();
-
-    public void run(){}
-
-    Object getAspect(cElementalDefinition definition){
-        return null;
-    }
-
-    String getAspectTag(cElementalDefinition definition){
-        return null;
-    }
-
-    iElementalDefinition getDefinition(String aspect){
-        return null;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
deleted file mode 100644
index 3cb2eafccd..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/AspectDefinitionCompatEnabled.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import thaumcraft.api.aspects.Aspect;
-
-import java.util.ArrayList;
-
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-
-/**
- * Created by Tec on 21.05.2017.
- */
-public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
-    @Override
-    public void run(){
-        defToAspect.put(magic_air,"aer");
-        defToAspect.put(magic_earth,"terra");
-        defToAspect.put(magic_fire,"ignis");
-        defToAspect.put(magic_water,"aqua");
-        defToAspect.put(magic_order,"ordo");
-        defToAspect.put(magic_entropy,"perditio");
-
-        aspectToDef.put("aer",magic_air);
-        aspectToDef.put("terra",magic_earth);
-        aspectToDef.put("ignis",magic_fire);
-        aspectToDef.put("aqua",magic_water);
-        aspectToDef.put("ordo",magic_order);
-        aspectToDef.put("perditio",magic_entropy);
-
-        ArrayList<Aspect> list=Aspect.getCompoundAspects();
-        Aspect[] array= list.toArray(new Aspect[0]);
-        while (!list.isEmpty()) {
-            for (Aspect aspect : array) {
-                if (list.contains(aspect)) {
-                    Aspect[] content = aspect.getComponents();
-                    if (content.length != 2) {
-                        list.remove(aspect);
-                    }else if(aspectToDef.containsKey(content[0].getTag()) && aspectToDef.containsKey(content[1].getTag())){
-                        try {
-                            dComplexAspectDefinition newAspect;
-                            if(content[0].getTag().equals(content[1].getTag())){
-                                newAspect = new dComplexAspectDefinition(aspectToDef.get(content[0].getTag()).getStackForm(2)
-                                );
-                            }else{
-                                newAspect = new dComplexAspectDefinition(aspectToDef.get(content[0].getTag()).getStackForm(1), aspectToDef.get(content[1].getTag()).getStackForm(1)
-                                );
-                            }
-                            aspectToDef.put(aspect.getTag(),newAspect);
-                            defToAspect.put(newAspect,aspect.getTag());
-                        }catch (tElementalException e) {
-                            /**/
-                        }finally {
-                            list.remove(aspect);
-                        }
-                    }
-                }
-            }
-        }
-
-        STACKS_REGISTERED.addAll(defToAspect.keySet());
-    }
-
-    @Override
-    Aspect getAspect(cElementalDefinition definition) {
-        return Aspect.getAspect(defToAspect.get(definition));
-    }
-
-    @Override
-    String getAspectTag(cElementalDefinition definition) {
-        return defToAspect.get(definition);
-    }
-
-    @Override
-    iElementalDefinition getDefinition(String aspect) {
-        return aspectToDef.get(aspect);
-    }
-
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
index ddef29b214..8f570c1247 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
@@ -24,7 +25,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class dComplexAspectDefinition extends cElementalDefinition implements iElementalAspect {
+public final class dComplexAspectDefinition extends cElementalDefinition {
     private final int hash;
     public final double mass;
 
@@ -252,11 +253,6 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme
         return null;
     }
 
-    @Override
-    public Object materializeIntoAspect() {
-        return AspectDefinitionCompat.aspectDefinitionCompat.getAspect(this);
-    }
-
     @Override
     public iElementalDefinition getAnti() {
         return null;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
index 02e7d2fe21..9c6d107bff 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
@@ -8,7 +8,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class ePrimalAspectDefinition extends cElementalPrimitive implements iElementalAspect {
+public final class ePrimalAspectDefinition extends cElementalPrimitive {
     public static final ePrimalAspectDefinition
             magic_air = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
             magic_earth = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
@@ -35,11 +35,6 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement
         return translateToLocal("tt.keyword.Primal") + ": " + name;
     }
 
-    @Override
-    public Object materializeIntoAspect() {
-        return AspectDefinitionCompat.aspectDefinitionCompat.getAspect(this);
-    }
-
     @Override
     public boolean isTimeSpanHalfLife() {
         return false;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java
deleted file mode 100644
index 3cb2d8e5e8..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/iElementalAspect.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-/**
- * Created by Tec on 21.05.2017.
- */
-public interface iElementalAspect {
-    Object materializeIntoAspect();
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
new file mode 100644
index 0000000000..343071e26e
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -0,0 +1,29 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
+
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import java.util.HashMap;
+
+/**
+ * Created by Tec on 21.05.2017.
+ */
+public class AspectDefinitionCompat {
+    public static AspectDefinitionCompat aspectDefinitionCompat;
+    public final HashMap<iElementalDefinition,String> defToAspect = new HashMap<>();
+    public final HashMap<String,iElementalDefinition> aspectToDef = new HashMap<>();
+
+    public void run(){}
+
+    public Object getAspect(iElementalDefinition definition){
+        return null;
+    }
+
+    public String getAspectTag(iElementalDefinition definition){
+        return null;
+    }
+
+    public iElementalDefinition getDefinition(String aspect){
+        return null;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
new file mode 100644
index 0000000000..446e9b66d5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -0,0 +1,81 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
+
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import thaumcraft.api.aspects.Aspect;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+
+/**
+ * Created by Tec on 21.05.2017.
+ */
+public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
+    @Override
+    public void run(){
+        defToAspect.put(magic_air,"aer");
+        defToAspect.put(magic_earth,"terra");
+        defToAspect.put(magic_fire,"ignis");
+        defToAspect.put(magic_water,"aqua");
+        defToAspect.put(magic_order,"ordo");
+        defToAspect.put(magic_entropy,"perditio");
+
+        aspectToDef.put("aer",magic_air);
+        aspectToDef.put("terra",magic_earth);
+        aspectToDef.put("ignis",magic_fire);
+        aspectToDef.put("aqua",magic_water);
+        aspectToDef.put("ordo",magic_order);
+        aspectToDef.put("perditio",magic_entropy);
+
+        ArrayList<Aspect> list=Aspect.getCompoundAspects();
+        Aspect[] array= list.toArray(new Aspect[0]);
+        while (!list.isEmpty()) {
+            for (Aspect aspect : array) {
+                if (list.contains(aspect)) {
+                    Aspect[] content = aspect.getComponents();
+                    if (content.length != 2) {
+                        list.remove(aspect);
+                    }else if(aspectToDef.containsKey(content[0].getTag()) && aspectToDef.containsKey(content[1].getTag())){
+                        try {
+                            dComplexAspectDefinition newAspect;
+                            if(content[0].getTag().equals(content[1].getTag())){
+                                newAspect = new dComplexAspectDefinition(
+                                        aspectToDef.get(content[0].getTag()).getStackForm(2));
+                            }else{
+                                newAspect = new dComplexAspectDefinition(
+                                        aspectToDef.get(content[0].getTag()).getStackForm(1),
+                                        aspectToDef.get(content[1].getTag()).getStackForm(1));
+                            }
+                            aspectToDef.put(aspect.getTag(),newAspect);
+                            defToAspect.put(newAspect,aspect.getTag());
+                        }catch (tElementalException e) {
+                            /**/
+                        }finally {
+                            list.remove(aspect);
+                        }
+                    }
+                }
+            }
+        }
+
+        STACKS_REGISTERED.addAll(defToAspect.keySet());
+    }
+
+    @Override
+    public Aspect getAspect(iElementalDefinition definition) {
+        return Aspect.getAspect(defToAspect.get(definition));
+    }
+
+    @Override
+    public String getAspectTag(iElementalDefinition definition) {
+        return defToAspect.get(definition);
+    }
+
+    @Override
+    public iElementalDefinition getDefinition(String aspect) {
+        return aspectToDef.get(aspect);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
index e77cab2734..63f55912a6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 
@@ -18,11 +18,15 @@ public class EssentiaCompat {
         return null;
     }
 
-    public boolean putElementalInstanceStack(TileEntity conatainer, cElementalInstanceStack stack){
+    public String getEssentiaName(iElementalDefinition stack){
+        return null;
+    }
+
+    public boolean putInContainer(TileEntity container, String name){
         return false;
     }
 
-    public cElementalInstanceStack getFromContainer(TileEntity container){
+    public iElementalDefinition getFromContainer(TileEntity container){
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
index 484377b179..03ff92b4e0 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
@@ -1,8 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.iElementalAspect;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 import thaumcraft.api.aspects.Aspect;
@@ -11,7 +9,7 @@ import thaumcraft.api.aspects.IAspectContainer;
 import thaumcraft.common.tiles.TileEssentiaReservoir;
 import thaumcraft.common.tiles.TileJarFillable;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompat.aspectToDef;
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat;
 
 /**
  * Created by Tec on 21.05.2017.
@@ -30,22 +28,28 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
     }
 
     @Override
-    public boolean putElementalInstanceStack(TileEntity container,cElementalInstanceStack stack){
-        if(container==null || container.isInvalid()) {
+    public String getEssentiaName(iElementalDefinition stack) {
+        return aspectDefinitionCompat.defToAspect.get(stack);
+    }
+
+    @Override
+    public boolean putInContainer(TileEntity container, String aspectName) {
+        if (container == null || container.isInvalid() || aspectName == null || aspectName.isEmpty()) {
             return false;
         }
-        if(container instanceof IAspectContainer && stack.definition instanceof iElementalAspect){
-            Aspect aspect=(Aspect) ((iElementalAspect) stack.definition).materializeIntoAspect();
-            if(aspect!=null){
-                ((IAspectContainer) container).addToContainer(aspect,1);
-                return true;
+        if (container instanceof IAspectContainer) {
+            Aspect aspect = Aspect.getAspect(aspectName);
+            if(aspect==null){
+                return false;
             }
+            int remaining=((IAspectContainer) container).addToContainer(aspect, 1);
+            return remaining==0;
         }
         return false;
     }
 
     @Override
-    public cElementalInstanceStack getFromContainer(TileEntity container){
+    public iElementalDefinition getFromContainer(TileEntity container){
         if(container==null || container.isInvalid()) {
             return null;
         }
@@ -55,10 +59,7 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
                 Aspect[] aspectsArr= aspects.getAspects();
                 if(aspectsArr!=null && aspectsArr[0]!=null){
                      if (((IAspectContainer) container).takeFromContainer(aspectsArr[0],1)){
-                         cElementalDefinition def=aspectToDef.get(aspectsArr[0].getTag());
-                         if(def!=null){
-                             return new cElementalInstanceStack(def,1);
-                         }
+                         return aspectDefinitionCompat.aspectToDef.get(aspectsArr[0].getTag());
                      }
                 }
             }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 8e8aee4795..c11a68b5d0 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -1,35 +1,38 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
-import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
+import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
+import static gregtech.api.enums.GT_Values.E;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -38,32 +41,31 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
+    private static final String[][] shape = new String[][]{
+            {"   ", " . ", "   ",},
+            {"0A0", E, "0A0",},
+            {"121", "232", "121",},
+            {"\"\"\"", "\"2\"", "\"\"\"",},
+            {"202", "0!0", "202",},
+    };
+    private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMeta = new byte[]{0, 0, 4, 8};
+    private static final IHatchAdder<GT_MetaTileEntity_EM_essentiaDequantizer>[] addingMethods = adders(
+            GT_MetaTileEntity_EM_essentiaDequantizer::addClassicToMachineList,
+            GT_MetaTileEntity_EM_essentiaDequantizer::addElementalInputToMachineList,
+            GT_MetaTileEntity_EM_essentiaDequantizer::addElementalMufflerToMachineList);
+    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.1"),//2 - Elemental Input Hatch
-            translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.2"),//3 - Elemental Overflow Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.2"),//3 - Elemental Overflow Hatches or Elemental Casing
             translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.3"),//General - Some sort of Essentia Storage
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaDequantizer> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_essentiaDequantizer>builder()
-            .addShape("main", new String[][]{
-                    {"DDD", "D~D", "DDD"},
-                    {"E E", "   ", "E E"},
-                    {"ABA", "BCB", "ABA"},
-                    {"FFF", "FBF", "FFF"},
-                    {"BEB", "EGE", "BEB"}
-            })
-            .addElement('A', ofBlock(sBlockCasingsTT, 0))
-            .addElement('B', ofBlock(sBlockCasingsTT, 4))
-            .addElement('C', ofBlock(sBlockCasingsTT, 8))
-            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaDequantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaDequantizer::addElementalMufflerToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('G', ofHatchAdder(GT_MetaTileEntity_EM_essentiaDequantizer::addElementalInputToMachineList, textureOffset + 4, 2))
-            .build();
-
+    private String outputEssentiaName;
     //endregion
 
     public GT_MetaTileEntity_EM_essentiaDequantizer(int aID, String aName, String aNameRegional) {
@@ -81,7 +83,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return essentiaContainerCompat.check(this) && structureCheck_EM("main", 1, 1, 0);
+        return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
     }
 
     @Override
@@ -91,24 +93,49 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             stopMachine();
             return false;
         }
+
         cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContainerHandler();
-        if (inputHatchContainer.hasStacks()) {
-            cElementalInstanceStack stack = inputHatchContainer.getFirst();
-            inputHatchContainer.removeAmount(false, new cElementalInstanceStack(stack.definition, 1));
-            if (!essentiaContainerCompat.putElementalInstanceStack(container, stack)) {
-                cleanStackEM_EM(stack);
-            }
-            mMaxProgresstime = 20;
-            mEfficiencyIncrease = 10000;
-            eAmpereFlow = 1;
-            if (stack.definition instanceof ePrimalAspectDefinition) {
-                mEUt = (int) -V[8];
+        if (inputHatchContainer == null || !inputHatchContainer.hasStacks()) {
+            return false;
+        }
+
+        cElementalInstanceStack stack = inputHatchContainer.get(TecTech.RANDOM.nextInt(inputHatchContainer.size()));
+        if (stack.amount < AVOGADRO_CONSTANT_DIMINISHED) {
+            cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+            mEUt = (int) -V[6];
+        } else {
+            outputEssentiaName = essentiaContainerCompat.getEssentiaName(stack.definition);
+            Aspect aspect = Aspect.getAspect(outputEssentiaName);
+            if (aspect == null) {
+                outputEssentiaName = null;
+                cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+                mEUt = (int) -V[7];
             } else {
-                mEUt = (int) -V[10];
+                inputHatchContainer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+                if (aspect.isPrimal()) {
+                    mEUt = (int) -V[8];
+                } else {
+                    mEUt = (int) -V[10];
+                }
+            }
+        }
+        mMaxProgresstime = 20;
+        mEfficiencyIncrease = 10000;
+        eAmpereFlow = 1;
+        return true;
+    }
+
+    @Override
+    public void outputAfterRecipe_EM() {
+        TileEntity container = essentiaContainerCompat.getContainer(this);
+        if (container == null) {
+            stopMachine();
+        }else{
+            if(!essentiaContainerCompat.putInContainer(container,outputEssentiaName)){
+                stopMachine();
             }
-            return true;
         }
-        return false;
+        outputEssentiaName=null;
     }
 
     @Override
@@ -143,16 +170,23 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
                 iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2);
             }
         }
-        structureBuild_EM("main", 1, 1, 0, hintsOnly, stackSize);
+        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, iGregTechTileEntity, getExtendedFacing(), hintsOnly);
     }
 
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_essentiaDequantizer> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
+    public String[] getStructureDescription(ItemStack stackSize) {
+        return description;
     }
 
     @Override
-    public String[] getStructureDescription(ItemStack stackSize) {
-        return description;
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setString("eOutputEssentia",outputEssentiaName);
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        outputEssentiaName=aNBT.getString("eOutputEssentia");
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 1e23408a0b..74dff47aa4 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -2,34 +2,35 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
-import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
+import static gregtech.api.enums.GT_Values.E;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -38,31 +39,29 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
+    private static final String[][] shape = new String[][]{
+            {"   ", " . ", "   ",},
+            {"0A0", E, "0A0",},
+            {"121", "232", "121",},
+            {"\"\"\"", "\"1\"", "\"\"\"",},
+            {"010", "1!1", "010",},
+    };
+    private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMeta = new byte[]{0, 4, 0, 8};
+    private static final IHatchAdder<GT_MetaTileEntity_EM_essentiaQuantizer>[] addingMethods = adders(
+            GT_MetaTileEntity_EM_essentiaQuantizer::addClassicToMachineList,
+            GT_MetaTileEntity_EM_essentiaQuantizer::addElementalOutputToMachineList,
+            GT_MetaTileEntity_EM_essentiaQuantizer::addElementalMufflerToMachineList);
+    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.1"),//2 - Elemental Output Hatch
-            translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.2"),//3 - Elemental Overflow Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.2"),//3 - Elemental Overflow Hatches or Elemental Casing
             translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.3"),//General - Some sort of Essentia Storage
     };
-
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaQuantizer> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_essentiaQuantizer>builder()
-            .addShape("main", new String[][]{
-                    {"FFF", "F~F", "FFF"},
-                    {"E E", "   ", "E E"},
-                    {"BAB", "ACA", "BAB"},
-                    {"DDD", "DBD", "DDD"},
-                    {"EBE", "BGB", "EBE"}
-            })
-            .addElement('A', ofBlock(sBlockCasingsTT, 0))
-            .addElement('B', ofBlock(sBlockCasingsTT, 4))
-            .addElement('C', ofBlock(sBlockCasingsTT, 8))
-            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaQuantizer::addElementalMufflerToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaQuantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('G', ofHatchAdder(GT_MetaTileEntity_EM_essentiaQuantizer::addElementalOutputToMachineList, textureOffset + 4, 2))
-            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_essentiaQuantizer(int aID, String aName, String aNameRegional) {
@@ -80,21 +79,20 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return essentiaContainerCompat.check(this) && structureCheck_EM("main", 1, 1, 0);
+        return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
     }
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
-        TileEntity container = essentiaContainerCompat.getContainer(this);
-        cElementalInstanceStack newStack = essentiaContainerCompat.getFromContainer(container);
-        if (newStack != null) {
+        iElementalDefinition definition  = essentiaContainerCompat.getFromContainer(essentiaContainerCompat.getContainer(this));
+        if (definition != null) {
             mMaxProgresstime = 20;
             mEfficiencyIncrease = 10000;
             eAmpereFlow = 1;
             outputEM = new cElementalInstanceStackMap[]{
-                    new cElementalInstanceStackMap(newStack)
+                    new cElementalInstanceStackMap(new cElementalInstanceStack(definition,AVOGADRO_CONSTANT))
             };
-            if (newStack.definition instanceof ePrimalAspectDefinition) {
+            if (definition instanceof ePrimalAspectDefinition) {
                 mEUt = (int) -V[8];
             } else {
                 mEUt = (int) -V[10];
@@ -146,12 +144,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
                 iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2);
             }
         }
-        structureBuild_EM("main", 1, 1, 0, hintsOnly, stackSize);
-    }
-
-    @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_essentiaQuantizer> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
+        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, iGregTechTileEntity, getExtendedFacing(), hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 8a03bd67b8..02fae0e194 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompat;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompatEnabled;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompatEnabled;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompatEnabled;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
@@ -40,7 +40,7 @@ import java.util.HashSet;
 
 import static com.github.technus.tectech.util.CommonValues.*;
 import static com.github.technus.tectech.TecTech.*;
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.AspectDefinitionCompat.aspectDefinitionCompat;
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat;
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index 0bf8c57f24..91dbffa71f 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -15,6 +15,7 @@ import cpw.mods.fml.common.Loader;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.CustomItemList.*;
 
@@ -73,22 +74,22 @@ public class MachineLoader implements Runnable {
         // ===================================================================================================
 
         eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f).getStackForm(1L));
+                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f).getStackForm(1L));
+                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f).getStackForm(1L));
+                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f).getStackForm(1L));
+                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f).getStackForm(1L));
+                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f).getStackForm(1L));
+                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f*AVOGADRO_CONSTANT).getStackForm(1L));
 
         
         // ===================================================================================================
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index dd388bc233..0e1771e88d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -1,7 +1,6 @@
 package com.github.technus.tectech.mechanics.anomaly;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
@@ -9,6 +8,7 @@ import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
 import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
@@ -28,15 +29,20 @@ import net.minecraftforge.event.world.ChunkEvent;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
-    public static final double SWAP_THRESHOLD = dAtomDefinition.getSomethingHeavy().getMass() * 10000D;
-    public static final int COUNT_DIV=32;
-    public static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
-    public static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
-    public static final int MEAN_DELAY =50;
-    private static final float CHARGE_EFFECTIVENESS = 10;
-    private static final float CHARGE_EXPLOSIVENESS = 5;
+    private static final double SWAP_THRESHOLD = dAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
+    private static final int COUNT_DIV=32;
+    private static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
+    private static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
+    private static final int MEAN_DELAY =50;
+    private static final double CANCER_EFFECTIVENESS = 1/AVOGADRO_CONSTANT;
+    private static final double CHARGE_EFFECTIVENESS = 10/AVOGADRO_CONSTANT;
+    private static final double CHARGE_EXPLOSIVENESS = 5/AVOGADRO_CONSTANT;
 
     private boolean fixMe=false;
     private final ArrayList<EntityPlayer> playersWithCharge = new ArrayList<>();
@@ -62,8 +68,9 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     public void tickWorld(HashMap<Integer, ChunkDataHandler.ChunkHashMap> data, TickEvent.WorldTickEvent aEvent) {
         if (TecTech.RANDOM.nextInt(MEAN_DELAY) == 0) {
             int dim = aEvent.world.provider.dimensionId;
-            data.get(dim).forEach((chunkCoordIntPair, compound) -> {
-                if (compound.getDouble(INTENSITY) >= SWAP_THRESHOLD) {
+            ChunkDataHandler.ChunkHashMap chunkHashMap = data.get(dim);
+            chunkHashMap.forEach((chunkCoordIntPair, compound) -> {
+                if (compound.getDouble(INTENSITY) > SWAP_THRESHOLD) {
                     Chunk chunk = aEvent.world.getChunkFromChunkCoords(chunkCoordIntPair.chunkXPos, chunkCoordIntPair.chunkZPos);
                     if (chunk.isChunkLoaded) {
                         worldDataArrayList.add(chunk);
@@ -72,21 +79,25 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
             });
             if (worldDataArrayList.size() >= 2) {
                 Chunk a = worldDataArrayList.remove(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
-                Chunk b = worldDataArrayList.remove(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
-                double avg = .5 * (data.get(dim).get(a.getChunkCoordIntPair()).getDouble(INTENSITY) +
-                        data.get(dim).get(b.getChunkCoordIntPair()).getDouble(INTENSITY));
-                data.get(dim).get(a.getChunkCoordIntPair()).setDouble(INTENSITY, Math.min(SWAP_THRESHOLD, avg * (TecTech.RANDOM.nextFloat() + .5F) * 0.5F));
-                data.get(dim).get(b.getChunkCoordIntPair()).setDouble(INTENSITY, Math.min(SWAP_THRESHOLD, avg * (TecTech.RANDOM.nextFloat() + .5F) * 0.5F));
-                data.get(dim).markForTransmissionToClient(a.getChunkCoordIntPair());
-                data.get(dim).markForTransmissionToClient(b.getChunkCoordIntPair());
-                swapSomething(a, b, (float) Math.min(Math.log10(avg), 20));
+                Chunk b = worldDataArrayList.get(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
+                ChunkCoordIntPair aCoords = a.getChunkCoordIntPair();
+                ChunkCoordIntPair bCoords = b.getChunkCoordIntPair();
+
+                double newValue = (chunkHashMap.get(aCoords).getDouble(INTENSITY) +
+                        chunkHashMap.get(bCoords).getDouble(INTENSITY))/2-SWAP_THRESHOLD/8;
+                float split=TecTech.RANDOM.nextFloat();
+
+                chunkHashMap.get(aCoords).setDouble(INTENSITY, newValue * split);
+                chunkHashMap.get(bCoords).setDouble(INTENSITY, newValue * (1-split));
+                chunkHashMap.markForTransmissionToClient(aCoords);
+                chunkHashMap.markForTransmissionToClient(bCoords);
+                swapSomething(a, b, newValue);
             }
             worldDataArrayList.clear();
         }
         for (Object o : aEvent.world.playerEntities) {
             if (o instanceof EntityPlayer && !((EntityPlayer) o).capabilities.isCreativeMode) {
-                float charge = TecTech.playerPersistence.getDataOrSetToNewTag((EntityPlayer) o).getFloat(SPACE_CHARGE);
-                if (charge != 0) {
+                if (getCharge((EntityPlayer) o) != 0) {
                     playersWithCharge.add((EntityPlayer) o);
                 }
             }
@@ -94,25 +105,25 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         if (playersWithCharge.size() > 0) {
             outer:
             for (EntityPlayer other : playersWithCharge) {
-                float fieldOther = TecTech.playerPersistence.getDataOrSetToNewTag(other).getFloat(SPACE_CHARGE);
+                double fieldOther = getCharge(other);
                 for (EntityPlayer player : playersWithCharge) {
                     if (other == player) {
                         continue outer;
                     }
-                    float field = TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE);
-                    float difference = Math.abs(field - fieldOther);
-                    if (difference != 0) {
+                    double field = getCharge(player);
+                    double absDifference = Math.abs(field - fieldOther);
+                    if (absDifference != 0) {
                         if (player.getDistanceSqToEntity(other) < 1) {
-                            float avg = (fieldOther + field) / 2;
-                            addAnomaly(other.worldObj.provider.dimensionId, new ChunkCoordIntPair(other.chunkCoordX, other.chunkCoordZ), Math.min(SWAP_THRESHOLD, PER_PARTICLE * difference));
-                            other.worldObj.createExplosion(other, other.posX, other.posY, other.posZ, Math.min(CHARGE_EXPLOSIVENESS * difference, 25), true);
-                            player.worldObj.createExplosion(player, player.posX, player.posY, player.posZ, Math.min(CHARGE_EXPLOSIVENESS * difference, 25), true);
-                            TecTech.playerPersistence.getDataOrSetToNewTag(player).setFloat(SPACE_CHARGE, avg);
-                            TecTech.playerPersistence.getDataOrSetToNewTag(other).setFloat(SPACE_CHARGE, avg);
-                            TecTech.playerPersistence.saveData(player);
-                            TecTech.playerPersistence.saveData(other);
-                            NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
-                            NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(other));
+                            double avg = (fieldOther + field) / 2;
+                            //addAnomaly(other.worldObj.provider.dimensionId, new ChunkCoordIntPair(other.chunkCoordX, other.chunkCoordZ), Math.min(SWAP_THRESHOLD, PER_PARTICLE * absDifference));
+                            if(TecTech.configTecTech.BOOM_ENABLE){
+                                other.worldObj.createExplosion(other, other.posX, other.posY, other.posZ,(float) Math.min(CHARGE_EXPLOSIVENESS * absDifference, 25), true);
+                                player.worldObj.createExplosion(player, player.posX, player.posY, player.posZ, (float) Math.min(CHARGE_EXPLOSIVENESS * absDifference, 25), true);
+                            }
+                            GT_Utility.sendSoundToPlayers(other.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int)other.posX, (int)other.posY, (int)other.posZ);
+                            GT_Utility.sendSoundToPlayers(player.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int)player.posX, (int)player.posY, (int)player.posZ);
+                            setCharge(player,avg);
+                            setCharge(other,avg);
                         }
                     }
                 }
@@ -121,8 +132,9 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         }
     }
 
-    private void swapSomething(Chunk a,Chunk b,float power) {
-        for (int i = 0; i < 64; i++) {
+    private void swapSomething(Chunk a,Chunk b,double mass) {
+        float explosionPower=(float) Math.log(mass/AVOGADRO_CONSTANT);
+        for (int i = 0; i < Math.min((int)explosionPower,64); i++) {
             int x = TecTech.RANDOM.nextInt(16);
             int y = TecTech.RANDOM.nextInt(a.worldObj.getActualHeight());
             int z = TecTech.RANDOM.nextInt(16);
@@ -143,12 +155,14 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 a.worldObj.setBlockToAir((a.xPosition << 4) + x, y, (a.zPosition << 4) + z);
                 b.worldObj.setBlockToAir((b.xPosition << 4) + x, y, (b.zPosition << 4) + z);
             }
-            if (TecTech.RANDOM.nextBoolean()) {
-                a.worldObj.createExplosion(null, (a.xPosition << 4) + x + .5, y + .5, (a.zPosition << 4) + z + .5, power, true);
+            if(TecTech.configTecTech.BOOM_ENABLE){
+                if (TecTech.RANDOM.nextBoolean()) {
+                    a.worldObj.createExplosion(null, (a.xPosition << 4) + x + .5, y + .5, (a.zPosition << 4) + z + .5, explosionPower*TecTech.RANDOM.nextFloat(), true);
+                }
                 GT_Utility.sendSoundToPlayers(a.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (a.xPosition << 4) + x, y, (a.zPosition << 4) + z);
-            }
-            if (TecTech.RANDOM.nextBoolean()) {
-                b.worldObj.createExplosion(null, (b.xPosition << 4) + x + .5, y + .5, (b.zPosition << 4) + z + .5, power, true);
+                if (TecTech.RANDOM.nextBoolean()) {
+                    b.worldObj.createExplosion(null, (b.xPosition << 4) + x + .5, y + .5, (b.zPosition << 4) + z + .5, explosionPower*TecTech.RANDOM.nextFloat(), true);
+                }
                 GT_Utility.sendSoundToPlayers(b.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (b.xPosition << 4) + x, y, (b.zPosition << 4) + z);
             }
         }
@@ -156,13 +170,13 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         int z = (b.xPosition - a.xPosition) << 4;
         List<EntityLivingBase> aE = a.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(a));
         List<EntityLivingBase> bE = b.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(b));
-        aE.forEach(o -> {
+        for (EntityLivingBase entityLivingBase : aE) {
             if (TecTech.RANDOM.nextBoolean()) {
-                o.setPositionAndUpdate(o.posX + x, o.posY, o.posZ + z);
-                o.attackEntityFrom(MainLoader.subspace,8+TecTech.RANDOM.nextInt(8));
-                if(o instanceof EntityPlayer){
-                    EntityPlayer player=((EntityPlayer) o);
-                    if(!player.capabilities.isCreativeMode) {
+                if (entityLivingBase instanceof EntityPlayer) {
+                    EntityPlayer player = ((EntityPlayer) entityLivingBase);
+                    if (!player.capabilities.isCreativeMode) {
+                        player.setPositionAndUpdate(entityLivingBase.posX + x, entityLivingBase.posY, entityLivingBase.posZ + z);
+                        player.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4)));
                         player.addPotionEffect(new PotionEffect(Potion.hunger.id, 1200));
                         player.addPotionEffect(new PotionEffect(Potion.weakness.id, 1000));
                         player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 800));
@@ -171,36 +185,35 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                         player.addPotionEffect(new PotionEffect(Potion.poison.id, 200));
                         player.addPotionEffect(new PotionEffect(Potion.blindness.id, 100));
                         player.addPotionEffect(new PotionEffect(Potion.wither.id, 60));
-                        TecTech.playerPersistence.getDataOrSetToNewTag(player).setFloat(SPACE_CHARGE,
-                                TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE)-(float)Math.abs(TecTech.RANDOM.nextGaussian()));
-                        TecTech.playerPersistence.saveData(player);
-                        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+                        addCharge(player, -mass * TecTech.RANDOM.nextFloat());
                     }
+                } else {
+                    entityLivingBase.setPositionAndUpdate(entityLivingBase.posX + x, entityLivingBase.posY, entityLivingBase.posZ + z);
+                    entityLivingBase.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4)));
                 }
             }
-        });
-        bE.forEach(o -> {
+        }
+        for (EntityLivingBase o : bE) {
             if (TecTech.RANDOM.nextBoolean()) {
-                o.setPositionAndUpdate(o.posX - x, o.posY, o.posZ - z);
-                o.attackEntityFrom(MainLoader.subspace,8+TecTech.RANDOM.nextInt(8));
-                if(o instanceof EntityPlayer){
-                    EntityPlayer player=((EntityPlayer) o);
-                    if(!player.capabilities.isCreativeMode) {
+                if (o instanceof EntityPlayer) {
+                    EntityPlayer player = ((EntityPlayer) o);
+                    if (!player.capabilities.isCreativeMode) {
+                        player.setPositionAndUpdate(o.posX - x, o.posY, o.posZ - z);
+                        player.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) -(explosionPower / 4)));
                         player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 800));
                         player.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 600));
                         player.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 400));
                         player.addPotionEffect(new PotionEffect(Potion.jump.id, 200));
                         player.addPotionEffect(new PotionEffect(Potion.resistance.id, 100));
                         player.addPotionEffect(new PotionEffect(Potion.regeneration.id, 60));
-                        TecTech.playerPersistence.getDataOrSetToNewTag(player).setFloat(SPACE_CHARGE,
-                                TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE)+(float)Math.abs(TecTech.RANDOM.nextGaussian()));
-
-                        TecTech.playerPersistence.saveData(player);
-                        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+                        addCharge(player, mass * TecTech.RANDOM.nextFloat());
                     }
+                } else {
+                    o.setPositionAndUpdate(o.posX + x, o.posY, o.posZ + z);
+                    o.attackEntityFrom(MainLoader.subspace, 8 + TecTech.RANDOM.nextInt((int) (explosionPower / 4)));
                 }
             }
-        });
+        }
     }
 
     @Override
@@ -218,38 +231,36 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 }
             }
 
-            data.get(player.worldObj.provider.dimensionId).forEach((chunkCoordIntPair, dat) -> {
+            for (Map.Entry<ChunkCoordIntPair, NBTTagCompound> entry : data.get(player.worldObj.provider.dimensionId).entrySet()) {
+                ChunkCoordIntPair chunkCoordIntPair = entry.getKey();
+                NBTTagCompound    dat               = entry.getValue();
                 if (Math.abs(chunkCoordIntPair.getCenterXPos() - player.posX) + Math.abs(chunkCoordIntPair.getCenterZPosition() - player.posZ) < 256) {
-                    for (int i = 0, pow = (int) Math.min(32, dat.getDouble(INTENSITY) / PER_PARTICLE); i < pow; i++) {
+                    for (int i = 0, pow = (int) Math.min(COUNT_DIV, dat.getDouble(INTENSITY) / PER_PARTICLE); i < pow; i++) {
                         TecTech.proxy.em_particle(player.worldObj,
                                 chunkCoordIntPair.getCenterXPos() + TecTech.RANDOM.nextGaussian() * 32D,
                                 player.posY + TecTech.RANDOM.nextFloat() * 128D - 64D,
                                 chunkCoordIntPair.getCenterZPosition() + TecTech.RANDOM.nextGaussian() * 32D);
                     }
                 }
-            });
+            }
         } else if (TecTech.RANDOM.nextInt(50) == 0) {
             EntityPlayer player = aEvent.player;
             ChunkCoordIntPair pair = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ);
             NBTTagCompound compound = data.get(player.worldObj.provider.dimensionId).get(pair);
             NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
             boolean saveRequired = false;
-            if(player.capabilities.isCreativeMode){
-                if (playerTag.getDouble(SPACE_CANCER) != 0) {
-                    playerTag.setDouble(SPACE_CANCER, 0);
-                    saveRequired = true;
-                }
-            }else {
+            if (!player.capabilities.isCreativeMode) {
+                double cancer=getCancer(player);
                 if (compound != null) {
                     int badness = (int) Math.min(COUNT_DIV, compound.getDouble(INTENSITY) / PER_PARTICLE);
                     if (badness > 0) {
-                        playerTag.setDouble(SPACE_CANCER, Math.min(2, playerTag.getDouble(SPACE_CANCER) + 9.765625E-4f * badness));
+                        playerTag.setDouble(SPACE_CANCER, Math.min(2, cancer + 9.765625E-4f * badness));
                         player.attackEntityFrom(MainLoader.subspace,Math.max(1,badness/8f));
                         saveRequired = true;
                     }
                 } else if (playerTag.getDouble(SPACE_CANCER) > 0 && !player.isDead) {
                     if (player.ticksExisted % 10 == 0) {
-                        playerTag.setDouble(SPACE_CANCER, Math.max(0, playerTag.getDouble(SPACE_CANCER) - 7.6293945E-5f));
+                        playerTag.setDouble(SPACE_CANCER, Math.max(0, cancer - 7.6293945E-5f));
                         saveRequired = true;
                     }
                 }
@@ -267,29 +278,26 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         EntityPlayer player=TecTech.proxy.getPlayer();
         if(player!=null) {
             if(!player.capabilities.isCreativeMode) {
-                NBTTagCompound tagCompound = TecTech.playerPersistence.getDataOrSetToNewTag(player);
-                if (tagCompound != null) {
-                    float cancer = tagCompound.getFloat(SPACE_CANCER);
-                    if (cancer > 0) {
-                        player.setInvisible(fixMe = TecTech.RANDOM.nextFloat() * 2 < cancer);
-                        player.setAngles((TecTech.RANDOM.nextFloat() - .5F) * 36 * cancer, (TecTech.RANDOM.nextFloat() - .5F) * 36 * cancer);
-                        cancer*=cancer/2F;
-                        if (cancer > 1.75f) {
-                            player.setVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
-                        } else {
-                            player.addVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
-                        }
+                double cancer = getCancer(player)*CANCER_EFFECTIVENESS;
+                if (cancer > 0) {
+                    player.setInvisible(fixMe = TecTech.RANDOM.nextFloat() * 2 < cancer);
+                    player.setAngles((TecTech.RANDOM.nextFloat() - .5F) * 36 * (float) cancer, (TecTech.RANDOM.nextFloat() - .5F) * 36 * (float) cancer);
+                    cancer*=cancer/2F;
+                    if (cancer > 1.75f) {
+                        player.setVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
+                    } else {
+                        player.addVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
                     }
                 }
 
-                float charge = TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_CHARGE);
+                double charge = getCharge(player);
                 if(charge!=0) {
                     for (Object o : player.worldObj.playerEntities) {
                         if (o instanceof EntityPlayer && !((EntityPlayer) o).capabilities.isCreativeMode) {
                             EntityPlayer otherPlayer=(EntityPlayer)o;
-                            float chargeOther = TecTech.playerPersistence.getDataOrSetToNewTag(otherPlayer).getFloat(SPACE_CHARGE);
+                            double chargeOther = getCharge(otherPlayer);
                             if (chargeOther != 0 && player != o) {
-                                float reaction = chargeOther * charge;
+                                double reaction = chargeOther * charge;
                                 if (reaction !=0) {
                                     double distanceSq = otherPlayer.getDistanceSqToEntity(player);
                                     if (distanceSq >= 1) {
@@ -328,19 +336,25 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         return 100;
     }
 
-    public void addAnomaly(IGregTechTileEntity iGregTechTileEntity, double amount) {
-        if (iGregTechTileEntity.isServerSide()) {
-            World w = iGregTechTileEntity.getWorld();
+    public void addAnomaly(IGregTechTileEntity gtTile, double amount) {
+        addAnomaly(gtTile.getWorld(),gtTile.getXCoord(),gtTile.getZCoord(),amount);
+    }
+
+    public void addAnomaly(TileEntity tileEntity, double amount) {
+        addAnomaly(tileEntity.getWorldObj(),tileEntity.xCoord,tileEntity.zCoord,amount);
+    }
+
+    public void addAnomaly(World w,int x,int z, double amount) {
+        if (!w.isRemote) {
             addAnomaly(w.provider.dimensionId,
                     new ChunkCoordIntPair(
-                            iGregTechTileEntity.getXCoord() >> 4,
-                            iGregTechTileEntity.getZCoord() >> 4),
+                            x >> 4,
+                            z >> 4),
                     amount);
         }
     }
 
     public void addAnomaly(int world, ChunkCoordIntPair chunk, double amount) {
-        amount=Math.abs(amount);
         NBTTagCompound old = TecTech.chunkDataHandler.getChunkData(this, world, chunk);
         if (old == null) {
             NBTTagCompound data = new NBTTagCompound();
@@ -351,4 +365,45 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         }
         TecTech.chunkDataHandler.getChunkData(this, world).markForTransmissionToClient(chunk);
     }
+
+    public double getCharge(EntityPlayer player){
+        return getDouble(player,SPACE_CHARGE);
+    }
+
+    public void setCharge(EntityPlayer player, double amount){
+        setDouble(player,SPACE_CHARGE,amount);
+    }
+
+    public void addCharge(EntityPlayer player, double amount){
+        addDouble(player,SPACE_CHARGE,amount);
+    }
+
+    public double getCancer(EntityPlayer player){
+        return getDouble(player,SPACE_CANCER);
+    }
+
+    public void setCancer(EntityPlayer player, double amount){
+        setDouble(player,SPACE_CANCER,amount);
+    }
+
+    public void addCancer(EntityPlayer player, double amount){
+        addDouble(player,SPACE_CANCER,amount);
+    }
+
+    public double getDouble(EntityPlayer player,String name){
+        return TecTech.playerPersistence.getDataOrSetToNewTag(player).getDouble(name);
+    }
+
+    public void setDouble(EntityPlayer player,String name, double amount){
+        TecTech.playerPersistence.getDataOrSetToNewTag(player).setDouble(name, amount);
+        TecTech.playerPersistence.saveData(player);
+        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+    }
+
+    public void addDouble(EntityPlayer player,String name, double amount){
+        NBTTagCompound data = TecTech.playerPersistence.getDataOrSetToNewTag(player);
+        data.setDouble(name, amount+data.getDouble(name));
+        TecTech.playerPersistence.saveData(player);
+        NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java
index a153671a59..bb61f50aab 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/CancerCommand.java
@@ -1,19 +1,14 @@
 package com.github.technus.tectech.mechanics.anomaly;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.NetworkDispatcher;
-import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.anomaly.AnomalyHandler.SPACE_CANCER;
-
 public class CancerCommand implements ICommand {
     ArrayList<String> aliases=new ArrayList<>();
 
@@ -39,13 +34,10 @@ public class CancerCommand implements ICommand {
                 return;
             }
             EntityPlayerMP player=(EntityPlayerMP)sender;
-            NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
             if(player.capabilities.isCreativeMode){
                 sender.addChatMessage(new ChatComponentText("Doesn't really work in creative mode!"));
             }else {
-                playerTag.setDouble(SPACE_CANCER, amount);
-                TecTech.playerPersistence.saveData(player);
-                NetworkDispatcher.INSTANCE.sendTo(new PlayerDataMessage.PlayerDataData(player), player);
+                TecTech.anomalyHandler.setCancer(player,amount);
                 sender.addChatMessage(new ChatComponentText("Cancer set to: "+amount));
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java
index da365a92f8..4190cd0dba 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/ChargeCommand.java
@@ -1,19 +1,14 @@
 package com.github.technus.tectech.mechanics.anomaly;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.NetworkDispatcher;
-import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.github.technus.tectech.mechanics.anomaly.AnomalyHandler.SPACE_CHARGE;
-
 public class ChargeCommand implements ICommand {
     ArrayList<String> aliases=new ArrayList<>();
 
@@ -33,13 +28,10 @@ public class ChargeCommand implements ICommand {
                 return;
             }
             EntityPlayerMP player=(EntityPlayerMP)sender;
-            NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
             if(player.capabilities.isCreativeMode){
                 sender.addChatMessage(new ChatComponentText("Doesn't really work in creative mode!"));
             }else {
-                playerTag.setDouble(SPACE_CHARGE, amount);
-                TecTech.playerPersistence.saveData(player);
-                NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
+                TecTech.anomalyHandler.setCharge(player,amount);
                 sender.addChatMessage(new ChatComponentText("Charge set to: "+amount));
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
index ec5391a0b4..69a4b9683c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformation
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.util.DoubleCount;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraft.item.ItemStack;
@@ -10,36 +9,64 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static java.lang.Math.pow;
 
 /**
  * Created by Tec on 26.05.2017.
  */
 public class bTransformationInfo {
+    /**
+     * Atom count per Mol
+     */
     public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000)/AVOGADRO_CONSTANT;
-    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / (144 * 1000);
-    public static final double AVOGADRO_CONSTANT_KIND_OF_SMALLER =AVOGADRO_CONSTANT-AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_KIND_OF_BIGGER =AVOGADRO_CONSTANT+AVOGADRO_CONSTANT_EPSILON;
+    /**
+     * Min. chance of existing
+     */
+    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
+    /**
+     * Quantity considered to be indifferent when computing stuff
+     */
+    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
+    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
     public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
+    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON*144D;
     public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
+    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON*1000D;
 
-    public static final Map<Integer,aFluidQuantizationInfo> fluidQuantization=new HashMap<>(32);
-    public static final Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization=new HashMap<>(32);
-    public static final Map<Integer,aOredictQuantizationInfo> oredictQuantization=new HashMap<>(32);
+    public static bTransformationInfo TRANSFORMATION_INFO = new bTransformationInfo();
+
+    public Map<Integer,aFluidQuantizationInfo> fluidQuantization;
+    public Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization;
+    public Map<Integer,aOredictQuantizationInfo> oredictQuantization;
 
     public Map<iElementalDefinition,aFluidDequantizationInfo> fluidDequantization;
     public Map<iElementalDefinition,aItemDequantizationInfo> itemDequantization;
     public Map<iElementalDefinition,aOredictDequantizationInfo> oredictDequantization;
 
-    public bTransformationInfo(int fluidCap,int itemCap, int oreCap){
-        fluidDequantization = fluidCap > 0 ? new HashMap<>(fluidCap) : Collections.emptyMap();
-        itemDequantization = itemCap > 0 ? new HashMap<>(itemCap) : Collections.emptyMap();
-        oredictDequantization = oreCap > 0 ? new HashMap<>(oreCap) : Collections.emptyMap();
+    private bTransformationInfo() {
+        this(
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
+        );
+    }
+
+    public bTransformationInfo(
+            Map<Integer, aFluidQuantizationInfo> fluidQuantization,
+            Map<aItemQuantizationInfo, aItemQuantizationInfo> itemQuantization,
+            Map<Integer, aOredictQuantizationInfo> oredictQuantization,
+            Map<iElementalDefinition, aFluidDequantizationInfo> fluidDequantization,
+            Map<iElementalDefinition, aItemDequantizationInfo> itemDequantization,
+            Map<iElementalDefinition, aOredictDequantizationInfo> oredictDequantization) {
+        this.fluidQuantization = fluidQuantization;
+        this.itemQuantization = itemQuantization;
+        this.oredictQuantization = oredictQuantization;
+        this.fluidDequantization = fluidDequantization;
+        this.itemDequantization = itemDequantization;
+        this.oredictDequantization = oredictDequantization;
     }
 
     public void addFluid(iHasElementalDefinition em, FluidStack fluidStack){
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
index 965c46cef6..e97d5994e9 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
@@ -42,7 +42,6 @@ public final class dAtomDefinition extends cElementalDefinition {
     private static final byte BYTE_OFFSET=32;
 
     private final int hash;
-    public static final bTransformationInfo TRANSFORMATION_INFO = new bTransformationInfo(16,0,64);
     public static double refMass, refUnstableMass;
 
     private static final byte nbtType = (byte) 'a';
@@ -1319,17 +1318,17 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     @Override
     public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return TRANSFORMATION_INFO.fluidDequantization.get(this);
+        return bTransformationInfo.TRANSFORMATION_INFO.fluidDequantization.get(this);
     }
 
     @Override
     public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return TRANSFORMATION_INFO.itemDequantization.get(this);
+        return bTransformationInfo.TRANSFORMATION_INFO.itemDequantization.get(this);
     }
 
     @Override
     public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return TRANSFORMATION_INFO.oredictDequantization.get(this);
+        return bTransformationInfo.TRANSFORMATION_INFO.oredictDequantization.get(this);
     }
 
     private static final class Nomenclature {
@@ -1475,119 +1474,119 @@ public final class dAtomDefinition extends cElementalDefinition {
         /*----STABLE ATOMS----**/
         refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
 
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
         //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
         //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
         //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
 
         /*----UNSTABLE ATOMS----**/
         refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
 
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
         //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
-        TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
+        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
         ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
         //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
         ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
-        TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
+        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
 
         try {
             dAtomDefinition temp;
-            TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(deuterium.definition, AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
+            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(deuterium.definition, AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
 
-            TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(tritium.definition, AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
+            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(tritium.definition, AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
 
-            TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(helium_3.definition, AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
+            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(helium_3.definition, AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
 
             temp=new dAtomDefinition(
                     new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 92),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 146)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
 
             double tempMass=temp.getMass();
 
@@ -1596,7 +1595,7 @@ public final class dAtomDefinition extends cElementalDefinition {
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 143)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
 
             TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
 
@@ -1605,14 +1604,14 @@ public final class dAtomDefinition extends cElementalDefinition {
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 145)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
 
             somethingHeavy=new dAtomDefinition(
                     new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 94),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
                     new cElementalDefinitionStack(dHadronDefinition.hadron_n, 147)
             );
-            TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
+            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
 
             TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
index c5efaf1403..4ea5eb3776 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
@@ -25,7 +25,7 @@ import java.util.Map;
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition.getNbtTagCompound;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.TRANSFORMATION_INFO;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static gregtech.api.enums.OrePrefixes.dust;
@@ -467,7 +467,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
         //Added to atom map, but should be in its own
         cElementalDefinitionStack neutrons=new cElementalDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
         TRANSFORMATION_INFO.oredictDequantization.put(neutrons.definition,new aOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
-        bTransformationInfo.oredictQuantization.put(
+        TRANSFORMATION_INFO.oredictQuantization.put(
                 OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
                 new aOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
         );
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
index ff9aca01ee..2a04af23d1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -29,9 +29,9 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 
 import java.util.Locale;
 
+import static com.github.technus.tectech.loader.MainLoader.elementalPollution;
 import static com.github.technus.tectech.util.CommonValues.DISPERSE_AT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.github.technus.tectech.loader.MainLoader.elementalPollution;
 import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -149,10 +149,10 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
         if (aBaseMetaTileEntity.isServerSide() && aTick % 20 == DISPERSE_AT) {
             if (aBaseMetaTileEntity.isActive()) {
                 if (overflowMatter > overflowDisperse) {
-                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowDisperse);
+                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowDisperse/(Math.pow(2,mTier)));
                     overflowMatter -= overflowDisperse;
                 } else {
-                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter);
+                    TecTech.anomalyHandler.addAnomaly(aBaseMetaTileEntity, overflowMatter/(Math.pow(2,mTier)));
                     overflowMatter = 0;
                     aBaseMetaTileEntity.setActive(false);
                     aBaseMetaTileEntity.setLightValue((byte) 0);
@@ -227,7 +227,7 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
     @Override
     public void onRemoval() {
         if (isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) {
-            TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), overflowMatter * 8D);
+            TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), overflowMatter);
             if (TecTech.configTecTech.BOOM_ENABLE) {
                 getBaseMetaTileEntity().doExplosion(V[15]);
             } else {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index 3fdf841b52..97b4a7786e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -53,7 +53,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
     public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10* AVOGADRO_CONSTANT;
-    private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 / URANIUM_INGOT_MASS_DIFF;
+    private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 / URANIUM_INGOT_MASS_DIFF;
     public static final double URANIUM_MASS_TO_EU_INSTANT = URANIUM_MASS_TO_EU_PARTIAL * 20;
 
     private String clientLocale = "en_US";
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 5b6b2c18e7..c3e35ba90c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -2,24 +2,24 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
+import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
-import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
@@ -31,18 +31,16 @@ import java.util.ArrayList;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.DEFAULT_ENERGY_LEVEL;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass;
+import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullFluid;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.Util.isInputEqual;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -51,21 +49,21 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_quantizer> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_quantizer>builder()
-            .addShape("main", transpose(new String[][]{
-                    {"CCC","BAB","EEE","DBD"},
-                    {"C~C","ABA","EBE","BFB"},
-                    {"CCC","BAB","EEE","DBD"}
-            }))
-            .addElement('A', ofBlock(sBlockCasingsTT, 0))
-            .addElement('B', ofBlock(sBlockCasingsTT, 4))
-            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_quantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_quantizer::addElementalMufflerToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList,textureOffset + 4, 2))
-            .build();
-
+    private static final String[][] shape = new String[][]{
+            {"   ", " . ", "   ",},
+            {"010", "101", "010",},
+            {"\"\"\"", "\"0\"", "\"\"\"",},
+            {"202", "0!0", "202",},
+    };
+    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, QuantumGlassBlock.INSTANCE};
+    private static final byte[] blockMeta = new byte[]{4, 0, 0};
+    private static final IHatchAdder<GT_MetaTileEntity_EM_quantizer>[] addingMethods = adders(
+            GT_MetaTileEntity_EM_quantizer::addClassicToMachineList,
+            GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList,
+            GT_MetaTileEntity_EM_quantizer::addElementalMufflerToMachineList);
+    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -89,7 +87,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM("main", 1, 1, 0);
+        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
     }
 
     @Override
@@ -100,9 +98,9 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
-                    aItemQuantizationInfo aIQI = bTransformationInfo.itemQuantization.get(new aItemQuantizationInfo(is, false, null));
+                    aItemQuantizationInfo aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, false, null));
                     if (aIQI == null) {
-                        aIQI = bTransformationInfo.itemQuantization.get(new aItemQuantizationInfo(is, true, null));//todo check if works?
+                        aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, true, null));//todo check if works?
                     }
                     if (aIQI == null) {
                         //ORE DICT quantization //todo fix for uranium?
@@ -111,7 +109,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (DEBUG_MODE) {
                                 TecTech.LOGGER.info("Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage() + ' ' + OreDictionary.getOreName(ID));
                             }
-                            aOredictQuantizationInfo aOQI = bTransformationInfo.oredictQuantization.get(ID);
+                            aOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.oredictQuantization.get(ID);
                             if (aOQI == null) {
                                 continue;
                             }
@@ -138,7 +136,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             FluidStack[] inF = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
-                    aFluidQuantizationInfo aFQI = bTransformationInfo.fluidQuantization.get(fs.getFluid().getID());
+                    aFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.fluidQuantization.get(fs.getFluid().getID());
                     if (aFQI == null) {
                         continue;
                     }
@@ -201,12 +199,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        structureBuild_EM("main", 1, 1, 0, hintsOnly, stackSize);
-    }
-
-    @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_quantizer> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
+        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index a0755b947b..30c9c509ec 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -2098,13 +2098,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
     @Override
     public void doExplosion(long aExplosionPower) {
-        explodeMultiblock();
         if (!TecTech.configTecTech.BOOM_ENABLE) {
             TecTech.proxy.broadcast("Multi DoExplosion BOOM! " + getBaseMetaTileEntity().getXCoord() + ' ' + getBaseMetaTileEntity().getYCoord() + ' ' + getBaseMetaTileEntity().getZCoord());
             StackTraceElement[] ste = Thread.currentThread().getStackTrace();
             TecTech.proxy.broadcast("Multi DoExplosion BOOM! " + ste[2].toString());
             return;
         }
+        explodeMultiblock();
         super.doExplosion(aExplosionPower);
     }//Redirecting to explodemultiblock
     //endregion
diff --git a/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java b/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java
index 4d66b28ca6..55fa327364 100644
--- a/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java
+++ b/src/main/java/com/github/technus/tectech/thing/tileEntity/ReactorSimTileEntity.java
@@ -89,7 +89,7 @@ public class ReactorSimTileEntity extends TileEntityNuclearReactorElectric {
 
     @Override
     public double getReactorEUEnergyOutput() {
-        return (double)(getReactorEnergyOutput() * 5.0F * ConfigUtil.getFloat(MainConfig.get(), "balance/energy/generator/nuclear"));
+        return getReactorEnergyOutput() * 5.0F * ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear");
     }
 
     //public List<TileEntity> getSubTiles() {
-- 
cgit 


From c82522576d27ba1b0fdaf7fe1283489cb9f40744 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sat, 15 Jan 2022 00:16:05 +0100
Subject: cherry pick

Cleanup EM maps
---
 .../tileentity/turret/TileTurretHeadEM.java        |  27 +-
 .../tileentity/turretbase/TileTurretBaseEM.java    |   4 +-
 .../definitions/dComplexAspectDefinition.java      |  42 +-
 .../definitions/ePrimalAspectDefinition.java       |   2 +-
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |   6 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |   4 +-
 .../elementalMatter/core/cElementalDecay.java      |  75 ---
 .../core/cElementalDecayResult.java                |  41 --
 .../core/cElementalDefinitionStackMap.java         |  65 ---
 .../core/cElementalInstanceStackMap.java           | 565 ---------------------
 .../core/cElementalMutableDefinitionStackMap.java  | 278 ----------
 .../elementalMatter/core/cElementalStackMap.java   | 181 -------
 .../elementalMatter/core/commands/GiveEM.java      |   6 +-
 .../core/decay/cElementalDecay.java                |  77 +++
 .../core/decay/cElementalDecayResult.java          |  43 ++
 .../elementalMatter/core/iElementalContainer.java  |  12 +
 .../core/iElementalInstanceContainer.java          |  10 -
 .../core/maps/cElementalConstantStackMap.java      |  58 +++
 .../core/maps/cElementalDefinitionStackMap.java    |  56 ++
 .../core/maps/cElementalInstanceStackMap.java      | 214 ++++++++
 .../core/maps/cElementalStackMap.java              |  50 ++
 .../elementalMatter/core/maps/iElementalMapR.java  | 187 +++++++
 .../elementalMatter/core/maps/iElementalMapRW.java | 130 +++++
 .../elementalMatter/core/rElementalRecipe.java     |  56 --
 .../elementalMatter/core/rElementalRecipeMap.java  |  70 ---
 .../core/recipes/rElementalRecipe.java             |  57 +++
 .../core/recipes/rElementalRecipeMap.java          |  73 +++
 .../core/stacks/cElementalDefinitionStack.java     |  35 +-
 .../core/stacks/cElementalInstanceStack.java       |  54 +-
 .../core/stacks/iElementalStack.java               |  23 +
 .../core/stacks/iHasElementalDefinition.java       |  18 -
 .../core/templates/cElementalDefinition.java       |  10 +-
 .../core/templates/cElementalPrimitive.java        |   6 +-
 .../core/templates/iElementalDefinition.java       |   6 +-
 .../transformations/aFluidDequantizationInfo.java  |  14 +-
 .../transformations/aFluidQuantizationInfo.java    |  14 +-
 .../transformations/aItemDequantizationInfo.java   |  14 +-
 .../transformations/aItemQuantizationInfo.java     |  16 +-
 .../aOredictDequantizationInfo.java                |  18 +-
 .../transformations/aOredictQuantizationInfo.java  |  18 +-
 .../core/transformations/bTransformationInfo.java  |  16 +-
 .../definitions/complex/dAtomDefinition.java       | 194 ++++---
 .../definitions/complex/dHadronDefinition.java     |  68 ++-
 .../primitive/cPrimitiveDefinition.java            |   2 +-
 .../definitions/primitive/eBosonDefinition.java    |   4 +-
 .../definitions/primitive/eLeptonDefinition.java   |   2 +-
 .../definitions/primitive/eNeutrinoDefinition.java |   2 +-
 .../definitions/primitive/eQuarkDefinition.java    |   2 +-
 .../github/technus/tectech/recipe/TT_recipe.java   |  30 +-
 .../technus/tectech/recipe/TT_recipeAdder.java     |  14 +-
 .../item/DebugElementalInstanceContainer_EM.java   |  12 +-
 .../item/ElementalDefinitionContainer_EM.java      |  18 +-
 .../item/ElementalDefinitionScanStorage_EM.java    |   2 +-
 ...GT_MetaTileEntity_Hatch_ElementalContainer.java |   8 +-
 .../GT_MetaTileEntity_Hatch_OutputElemental.java   |   2 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       | 109 ++--
 .../multi/GT_MetaTileEntity_EM_decay.java          | 100 ++--
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |  63 +--
 .../multi/GT_MetaTileEntity_EM_junction.java       |   6 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |  14 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        | 114 ++---
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |  90 ++--
 .../multi/em_machine/Behaviour_Centrifuge.java     |   8 +-
 .../multi/em_machine/Behaviour_Electrolyzer.java   |   2 +-
 .../Behaviour_ElectromagneticSeparator.java        |   6 +-
 .../multi/em_machine/Behaviour_PrecisionLaser.java |   2 +-
 .../multi/em_machine/Behaviour_Recycler.java       |   2 +-
 .../multi/em_machine/Behaviour_Scanner.java        |   2 +-
 .../em_machine/GT_MetaTileEntity_EM_machine.java   |  58 +--
 69 files changed, 1568 insertions(+), 2019 deletions(-)
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java

diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index fd039a0630..e027c83107 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -1,9 +1,8 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turret;
 
-import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
@@ -16,7 +15,6 @@ import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
 
 /**
  * Created by Bass on 27/07/2017.
@@ -54,7 +52,7 @@ public class TileTurretHeadEM extends TurretHead{
 
     @Override
     public boolean requiresAmmo() {
-        return hatchContentPointer == null || !hatchContentPointer.hasStacks();
+        return hatchContentPointer == null || hatchContentPointer.isEmpty();
     }
 
     @Override
@@ -69,20 +67,15 @@ public class TileTurretHeadEM extends TurretHead{
 
     @Override
     public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) {
-        while(hatchContentPointer!=null && hatchContentPointer.hasStacks()) {
-            cElementalInstanceStack stack = hatchContentPointer.get(TecTech.RANDOM.nextInt(hatchContentPointer.size()));
-            if(stack.amount<AVOGADRO_CONSTANT_DIMINISHED){
-                TecTech.anomalyHandler.addAnomaly(this,hatchContentPointer.remove(stack.definition).getMass());//todo reduce
-                continue;
-            }
-            hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
-            stack=stack.clone();
-            stack.amount = AVOGADRO_CONSTANT;
-            return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
+        if (hatchContentPointer == null || hatchContentPointer.isEmpty()) {
+            return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
         }
-        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
-
-        //todo make the recipe require some overflow hatches
+        cElementalInstanceStack stack = hatchContentPointer.getRandom();
+        double amount = Math.min(AVOGADRO_CONSTANT,stack.amount);
+        hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+        stack=stack.clone();
+        stack.amount = amount;
+        return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index a31ba4ef2c..a5d64fb886 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import cpw.mods.fml.common.Optional;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -63,6 +63,6 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
 
     private cElementalInstanceStackMap getFromHatch(GT_MetaTileEntity_Hatch_InputElemental hatch) {
         hatch.updateTexture((byte) 8,(byte) 4);
-        return hatch.getContainerHandler();
+        return hatch.getContentHandler();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
index 8f570c1247..98ad5bbf63 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
 import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -18,7 +18,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -31,37 +31,27 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
 
     private static final byte nbtType = (byte) 'c';
 
-    private final cElementalDefinitionStackMap aspectStacks;
-
-    @Deprecated
-    public dComplexAspectDefinition(cElementalDefinition... aspects) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(aspects));
-    }
-
-    @Deprecated
-    private dComplexAspectDefinition(boolean check, cElementalDefinition... aspects) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(aspects));
-    }
+    private final cElementalConstantStackMap aspectStacks;
 
     public dComplexAspectDefinition(cElementalDefinitionStack... aspects) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(aspects));
+        this(true, new cElementalConstantStackMap(aspects));
     }
 
     private dComplexAspectDefinition(boolean check, cElementalDefinitionStack... aspects) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(aspects));
+        this(check, new cElementalConstantStackMap(aspects));
     }
 
-    public dComplexAspectDefinition(cElementalDefinitionStackMap aspects) throws tElementalException {
+    public dComplexAspectDefinition(cElementalConstantStackMap aspects) throws tElementalException {
         this(true, aspects);
     }
 
-    private dComplexAspectDefinition(boolean check, cElementalDefinitionStackMap aspects) throws tElementalException {
+    private dComplexAspectDefinition(boolean check, cElementalConstantStackMap aspects) throws tElementalException {
         if (check && !canTheyBeTogether(aspects)) {
             throw new tElementalException("Hadron Definition error");
         }
         aspectStacks = aspects;
         float mass = 0;
-        for (cElementalDefinitionStack stack : aspects.values()) {
+        for (cElementalDefinitionStack stack : aspects.valuesToArray()) {
             mass += stack.getMass();
         }
         this.mass = mass;
@@ -69,9 +59,9 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     }
 
     //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
+    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
         long amount = 0;
-        for (cElementalDefinitionStack aspects : stacks.values()) {
+        for (cElementalDefinitionStack aspects : stacks.valuesToArray()) {
             if (!(aspects.definition instanceof dComplexAspectDefinition) && !(aspects.definition instanceof ePrimalAspectDefinition)) {
                 return false;
             }
@@ -97,7 +87,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     @Override
     public String getSymbol() {
         StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.values()) {
+        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
             if (aspect.definition instanceof ePrimalAspectDefinition) {
                 for (int i = 0; i < aspect.amount; i++) {
                     symbol.append(aspect.definition.getSymbol());
@@ -116,7 +106,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     @Override
     public String getShortSymbol() {
         StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.values()) {
+        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
             if (aspect.definition instanceof ePrimalAspectDefinition) {
                 for (int i = 0; i < aspect.amount; i++) {
                     symbol.append(aspect.definition.getShortSymbol());
@@ -137,10 +127,10 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
         return getNbtTagCompound(nbtType, aspectStacks);
     }
 
-    public static NBTTagCompound getNbtTagCompound(byte nbtType, cElementalDefinitionStackMap aspectStacks) {
+    public static NBTTagCompound getNbtTagCompound(byte nbtType, cElementalConstantStackMap aspectStacks) {
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setByte("t", nbtType);
-        cElementalDefinitionStack[] quarkStacksValues = aspectStacks.values();
+        cElementalDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
         nbt.setInteger("i", quarkStacksValues.length);
         for (int i = 0; i < quarkStacksValues.length; i++) {
             nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
@@ -189,7 +179,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition {
     }
 
     @Override
-    public cElementalDefinitionStackMap getSubParticles() {
+    public cElementalConstantStackMap getSubParticles() {
         return aspectStacks;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
index 9c6d107bff..5db067a552 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index c11a68b5d0..c939f10d6b 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
@@ -94,12 +94,12 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             return false;
         }
 
-        cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContainerHandler();
+        cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContentHandler();
         if (inputHatchContainer == null || !inputHatchContainer.hasStacks()) {
             return false;
         }
 
-        cElementalInstanceStack stack = inputHatchContainer.get(TecTech.RANDOM.nextInt(inputHatchContainer.size()));
+        cElementalInstanceStack stack = inputHatchContainer.getRandom();
         if (stack.amount < AVOGADRO_CONSTANT_DIMINISHED) {
             cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
             mEUt = (int) -V[6];
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 74dff47aa4..62ac339155 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
@@ -108,7 +108,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
             stopMachine();
             return;
         }
-        eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]);
+        eOutputHatches.get(0).getContentHandler().putUnifyAll(outputEM[0]);
         outputEM = null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java
deleted file mode 100644
index e67f773a86..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecay.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cElementalDecay {
-    public static final cElementalDecay[] noDecay = null;
-    //DECAY IMPOSSIBLE!!!
-    //Do not use regular NULL java will not make it work with varargs!!!
-    //Or cast null into ARRAY type but this static is more convenient!!!
-    public static final cElementalDecay[] noProduct = new cElementalDecay[0];
-    //this in turn can be used to tell that the thing should just vanish
-    public final cElementalDefinitionStackMap outputStacks;
-    public final double probability;
-
-    public cElementalDecay(iElementalDefinition... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, iElementalDefinition... outSafe) {
-        cElementalDefinitionStack[] outArr = new cElementalDefinitionStack[outSafe.length];
-        for (int i = 0; i < outArr.length; i++) {
-            outArr[i] = new cElementalDefinitionStack(outSafe[i], 1D);
-        }
-        outputStacks = new cElementalDefinitionStackMap(outArr);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalDefinitionStack... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, cElementalDefinitionStack... out) {
-        outputStacks = new cElementalDefinitionStackMap(out);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalDefinitionStackMap tree) {
-        this(1D, tree);
-    }
-
-    public cElementalDecay(double probability, cElementalDefinitionStackMap tree) {
-        outputStacks = tree;
-        this.probability = probability;
-    }
-
-    public cElementalInstanceStackMap getResults(double lifeMult, double age, long energyTotalForProducts, double amountDecaying) {
-        cElementalInstanceStackMap decayResult = new cElementalInstanceStackMap();
-        if (outputStacks == null) {
-            return decayResult;//This is to prevent null pointer exceptions.
-        }
-        //Deny decay code is in instance!
-        double qtty = 0D;
-        for (cElementalDefinitionStack stack : outputStacks.values()) {
-            qtty= add(qtty,stack.amount);
-        }
-        if (qtty <= 0D) {
-            return decayResult;
-        }
-        //energyTotalForProducts /= qtty;
-        //lifeMult /= (float) qtty;
-        for (cElementalDefinitionStack stack : outputStacks.values()) {
-            decayResult.putUnify(new cElementalInstanceStack(stack.definition,
-                    amountDecaying * stack.amount,
-                    lifeMult, age/*new products*/, (long)(energyTotalForProducts / Math.max(1D, Math.abs(stack.amount)))));//get instances from stack
-        }
-        return decayResult;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java
deleted file mode 100644
index 4ca63d14fe..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDecayResult.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-public class cElementalDecayResult {
-    private final cElementalInstanceStackMap output;
-    private double massAffected;
-    private double massDiff;
-
-    public cElementalDecayResult(cElementalInstanceStackMap output, double massAffected, double massDiff) {
-        this.output = output;
-        this.massAffected = massAffected;
-        this.massDiff = massDiff;
-    }
-
-    public cElementalInstanceStackMap getOutput() {
-        return output;
-    }
-
-    /**
-     * How much was lost in the process (decayed or removed)
-     * @return
-     */
-    public double getMassAffected() {
-        return massAffected;
-    }
-
-    /**
-     * Difference of mass of actually decayed elements
-     * @return
-     */
-    public double getMassDiff() {
-        return massDiff;
-    }
-
-    public void setMassAffected(double massAffected) {
-        this.massAffected = massAffected;
-    }
-
-    public void setMassDiff(double massDiff) {
-        this.massDiff = massDiff;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java
deleted file mode 100644
index ce0840bc8b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalDefinitionStackMap.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-public final class cElementalDefinitionStackMap/*IMMUTABLE*/ extends cElementalStackMap {//Target class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public static final cElementalDefinitionStackMap EMPTY = new cElementalDefinitionStackMap();
-
-    private cElementalDefinitionStackMap() {
-        map = new TreeMap<>();
-    }
-
-    @Deprecated
-    public cElementalDefinitionStackMap(iElementalDefinition... in) {
-        map=new cElementalMutableDefinitionStackMap(in).map;
-    }
-
-    public cElementalDefinitionStackMap(cElementalDefinitionStack... in) {
-        map=new cElementalMutableDefinitionStackMap(in).map;
-    }
-
-    public cElementalDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        map = new TreeMap<>(in);
-    }
-
-    cElementalDefinitionStackMap(cElementalMutableDefinitionStackMap unsafeMap){
-        map=unsafeMap.map;
-    }
-
-    //IMMUTABLE DON'T NEED IT
-    @Override
-    public cElementalDefinitionStackMap clone() {
-        return this;
-    }
-
-    public cElementalMutableDefinitionStackMap toMutable() {
-        return new cElementalMutableDefinitionStackMap(map);
-    }
-
-    @Override
-    @Deprecated//BETTER TO JUST MAKE A MUTABLE VERSION AND DO SHIT ON IT
-    public TreeMap<iElementalDefinition, cElementalDefinitionStack> getRawMap() {
-        return toMutable().getRawMap();
-    }
-
-    public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalDefinitionStackMap(defStacks);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
deleted file mode 100644
index e1fdc6a553..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalInstanceStackMap.java
+++ /dev/null
@@ -1,565 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.*;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.util.DoubleCount.add;
-import static com.github.technus.tectech.util.DoubleCount.sub;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalInstanceStackMap implements Comparable<cElementalInstanceStackMap> {
-    TreeMap<iElementalDefinition, cElementalInstanceStack> map;
-
-    //Constructors
-    public cElementalInstanceStackMap() {
-        map = new TreeMap<>();
-    }
-
-    public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) {
-        this(true, inSafe);
-    }
-
-    public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) {
-        map = new TreeMap<>();
-        if (clone) {
-            cElementalInstanceStack[] stacks=new cElementalInstanceStack[in.length];
-            for(int i=0;i<stacks.length;i++) {
-                stacks[i] = in[i].clone();
-            }
-            putUnifyAll(stacks);
-        } else {
-            putUnifyAll(in);
-        }
-    }
-
-    @Deprecated
-    private cElementalInstanceStackMap(TreeMap<iElementalDefinition, cElementalInstanceStack> inSafe) {
-        this(true, inSafe);
-    }
-
-    @Deprecated
-    private cElementalInstanceStackMap(boolean clone, TreeMap<iElementalDefinition, cElementalInstanceStack> in) {
-        if (clone) {
-            map = new TreeMap<>();
-            for(cElementalInstanceStack stack:in.values()) {
-                putUnify(stack.clone());
-            }
-        } else {
-            map = in;
-        }
-    }
-
-    public cElementalInstanceStackMap(cElementalInstanceStackMap inSafe) {
-        this(true, inSafe.map);
-    }
-
-    public cElementalInstanceStackMap(boolean copy, cElementalInstanceStackMap in) {
-        this(copy, in.map);
-    }
-
-    @Override
-    public cElementalInstanceStackMap clone() {
-        return new cElementalInstanceStackMap(map);
-    }
-
-    public cElementalMutableDefinitionStackMap toDefinitionMapForComparison() {
-        cElementalDefinitionStack[] list = new cElementalDefinitionStack[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack stack : map.values()) {
-            list[i++] = new cElementalDefinitionStack(stack.definition, stack.amount);
-        }
-        return new cElementalMutableDefinitionStackMap(list);
-    }
-
-    //@Deprecated
-    //public cElementalStackMap toDefinitionMap(boolean mutable) {
-    //    TreeMap<iElementalDefinition, cElementalDefinitionStack> newMap = new TreeMap<>();
-    //    for (cElementalInstanceStack stack : map.values()) {
-    //        newMap.put(stack.definition, new cElementalDefinitionStack(stack.definition, stack.amount));
-    //    }
-    //    if (mutable) {
-    //        return new cElementalMutableDefinitionStackMap(newMap);
-    //    }
-    //    return new cElementalDefinitionStackMap(newMap);
-    //}
-
-    @Deprecated
-    public Map<iElementalDefinition, cElementalInstanceStack> getRawMap() {
-        return map;
-    }
-
-    public Set<Map.Entry<iElementalDefinition, cElementalInstanceStack>> getEntrySet() {
-        return map.entrySet();
-    }
-
-
-    //Removers
-    public void clear() {
-        map.clear();
-    }
-
-    public cElementalInstanceStack remove(iElementalDefinition def) {
-        return map.remove(def);
-    }
-
-    @Deprecated
-    public cElementalInstanceStack remove(iHasElementalDefinition has) {
-        return map.remove(has.getDefinition());
-    }
-
-    public void removeAll(iElementalDefinition... definitions) {
-        for (iElementalDefinition def : definitions) {
-            map.remove(def);
-        }
-    }
-
-    @Deprecated
-    private void removeAll(iHasElementalDefinition... hasElementalDefinition) {
-        for (iHasElementalDefinition has : hasElementalDefinition) {
-            map.remove(has.getDefinition());
-        }
-    }
-
-    //Remove amounts
-    public boolean removeAmount(boolean testOnly, cElementalInstanceStack instance) {
-        cElementalInstanceStack target = map.get(instance.definition);
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= instance.amount;
-        } else {
-            double diff = sub(target.amount,instance.amount);
-            if (diff > 0) {
-                target.amount = diff;
-                return true;
-            } else if (diff == 0) {
-                map.remove(instance.definition);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean removeAmount(boolean testOnly, iHasElementalDefinition stack) {
-        cElementalInstanceStack target = map.get(stack.getDefinition());
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= stack.getAmount();
-        } else {
-            double diff = sub(target.amount,stack.getAmount());
-            if (diff > 0) {
-                target.amount = diff;
-                return true;
-            } else if (diff == 0) {
-                map.remove(stack.getDefinition());
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Deprecated
-    public boolean removeAmount(boolean testOnly, iElementalDefinition def) {
-        return removeAmount(testOnly, new cElementalDefinitionStack(def, 1D));
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStack... instances) {
-        boolean test = true;
-        for (cElementalInstanceStack stack : instances) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (cElementalInstanceStack stack : instances) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, iHasElementalDefinition... stacks) {
-        boolean test = true;
-        for (iHasElementalDefinition stack : stacks) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (iHasElementalDefinition stack : stacks) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    @Deprecated
-    public boolean removeAllAmounts(boolean testOnly, iElementalDefinition... definitions) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[definitions.length];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = new cElementalDefinitionStack(definitions[i], 1);
-        }
-        return removeAllAmounts(testOnly, stacks);
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    //Remove overflow
-    public double removeOverflow(int stacksCount, double stackCapacity) {
-        double massRemoved = 0;
-
-        if (map.size() > stacksCount) {
-            iElementalDefinition[] keys = keys();
-            for (int i = stacksCount; i < keys.length; i++) {
-                massRemoved += map.get(keys[i]).getDefinitionStack().getMass();
-                map.remove(keys[i]);
-            }
-        }
-
-        for (cElementalInstanceStack instance : values()) {
-            if (instance.amount > stackCapacity) {
-                massRemoved += instance.definition.getMass() * (instance.amount - stackCapacity);
-                instance.amount = stackCapacity;
-            }
-        }
-        return massRemoved;
-    }
-
-    //Put replace
-    public cElementalInstanceStack putReplace(cElementalInstanceStack instanceUnsafe) {
-        return map.put(instanceUnsafe.definition, instanceUnsafe);
-    }
-
-    public void putReplaceAll(cElementalInstanceStack... instances) {
-        for (cElementalInstanceStack instance : instances) {
-            map.put(instance.definition, instance);
-        }
-    }
-
-    private void putReplaceAll(Map<iElementalDefinition, cElementalInstanceStack> inTreeUnsafe) {
-        map.putAll(inTreeUnsafe);
-    }
-
-    public void putReplaceAll(cElementalInstanceStackMap inContainerUnsafe) {
-        putReplaceAll(inContainerUnsafe.map);
-    }
-
-    //Put unify
-    public cElementalInstanceStack putUnify(cElementalInstanceStack instance) {
-        cElementalInstanceStack stack=map.get(instance.definition);
-        if(stack==null) {
-            return map.put(instance.definition, instance);
-        }
-        return map.put(instance.definition, stack.unifyIntoThis(instance));
-    }
-
-    public void putUnifyAll(cElementalInstanceStack... instances) {
-        for (cElementalInstanceStack instance : instances) {
-            putUnify(instance);
-        }
-    }
-
-    private void putUnifyAll(Map<iElementalDefinition, cElementalInstanceStack> inTreeUnsafe) {
-        for (cElementalInstanceStack in : inTreeUnsafe.values()) {
-            putUnify(in);
-        }
-    }
-
-    public void putUnifyAll(cElementalInstanceStackMap containerUnsafe) {
-        putUnifyAll(containerUnsafe.map);
-    }
-
-    //Getters
-    public cElementalInstanceStack getFirst(){
-        return map.firstEntry().getValue();
-    }
-
-    public cElementalInstanceStack getLast(){
-        return map.lastEntry().getValue();
-    }
-
-    public cElementalInstanceStack getInstance(iElementalDefinition def) {
-        return map.get(def);
-    }
-
-    public cElementalInstanceStack get(int i){
-        Collection<cElementalInstanceStack> var = map.values();
-        return var.toArray(new cElementalInstanceStack[0])[i];
-    }
-
-    public String[] getShortSymbolsInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            info[i++] = instance.definition.getShortSymbol();
-        }
-        return info;
-    }
-
-    public String[] getElementalInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName()+
-                    " "+ EnumChatFormatting.AQUA + instance.definition.getSymbol()+ EnumChatFormatting.RESET+
-                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E",instance.amount/ AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
-                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
-                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
-        }
-        return info;
-    }
-
-    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanShortSymbols(list,capabilities);
-        }
-        return list;
-    }
-
-    public ArrayList<String> getScanInfo(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanResults(list,capabilities);
-        }
-        return list;
-    }
-
-    public cElementalInstanceStack[] values() {
-        Collection<cElementalInstanceStack> var = map.values();
-        return var.toArray(new cElementalInstanceStack[0]);
-    }
-
-    public iElementalDefinition[] keys() {
-        Set<iElementalDefinition> var = map.keySet();
-        return var.toArray(new iElementalDefinition[0]);
-    }
-
-    public double getMass() {
-        double mass = 0;
-        for (cElementalInstanceStack stack : map.values()) {
-            mass += stack.getMass();
-        }
-        return mass;
-    }
-
-    public double getCharge() {
-        double charge = 0;
-        for (cElementalInstanceStack stack : map.values()) {
-            charge += stack.getCharge();
-        }
-        return charge;
-    }
-
-    public double getCountOfAllAmounts(){
-        double sum=0;
-        for(cElementalInstanceStack stack:map.values()){
-            sum= add(sum,stack.amount);
-        }
-        return sum;
-    }
-
-    //Tests
-    public boolean containsDefinition(iElementalDefinition def) {
-        return map.containsKey(def);
-    }
-
-    public boolean containsInstance(cElementalInstanceStack inst) {
-        return map.containsValue(inst);
-    }
-
-    public int size() {
-        return map.size();
-    }
-
-    public boolean hasStacks() {
-        return !map.isEmpty();
-    }
-
-    public boolean isEmpty(){
-        return map.isEmpty();
-    }
-
-    //Tick Content
-    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
-        return tickContent(lifeTimeMult,postEnergize,1D);
-    }
-
-    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
-        cleanUp();
-        double diff=0;
-        for (cElementalInstanceStack instance : values()) {
-            cElementalDecayResult newInstances = instance.decay(lifeTimeMult, instance.age += seconds, postEnergize);
-            if (newInstances == null) {
-                instance.nextColor();
-            } else {
-                diff=add(diff,newInstances.getMassDiff());
-                removeAmount(false,instance);
-                putUnifyAll(newInstances.getOutput());
-            }
-        }
-        return diff;
-    }
-
-    //NBT
-    public NBTTagCompound getShortSymbolsNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getShortSymbolsInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getInfoNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getElementalInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanShortSymbols(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanInfo(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger("i", map.size());
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            nbt.setTag(Integer.toString(i++), instance.toNBT());
-        }
-        return nbt;
-    }
-
-    public static cElementalInstanceStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalInstanceStack[] instances = new cElementalInstanceStack[nbt.getInteger("i")];
-        for (int i = 0; i < instances.length; i++) {
-            instances[i] = cElementalInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (instances[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalInstanceStackMap(false, instances);
-    }
-
-    //stackUp
-    public static cElementalInstanceStack[] stackUp(cElementalInstanceStack... in) {
-        cElementalInstanceStackMap inTree = new cElementalInstanceStackMap();
-        inTree.putUnifyAll(in);
-        return inTree.values();
-    }
-
-    @Override
-    public int compareTo(cElementalInstanceStackMap o) {
-        int sizeDiff = map.size() - o.map.size();
-        if (sizeDiff != 0) {
-            return sizeDiff;
-        }
-        cElementalInstanceStack[] ofThis = values(), ofThat = o.values();
-        for (int i = 0; i < ofThat.length; i++) {
-            int result = ofThis[i].compareTo(ofThat[i]);
-            if (result != 0) {
-                return result;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo((cElementalInstanceStackMap) obj) == 0;
-        }
-        if (obj instanceof cElementalStackMap) {
-            return toDefinitionMapForComparison().compareTo((cElementalStackMap) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Hash only definitions to compare contents not amounts or data
-        int hash = -(map.size() << 4);
-        for (cElementalInstanceStack stack : map.values()) {
-            hash += stack.definition.hashCode();
-        }
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder build=new StringBuilder("Instance Stack Map\n");
-        for(cElementalInstanceStack stack:map.values()){
-            build.append(stack.toString()).append('\n');
-        }
-        return build.toString();
-    }
-
-    public cElementalInstanceStackMap takeAllToNewMap(){
-        TreeMap<iElementalDefinition, cElementalInstanceStack> map=this.map;
-        this.map=new TreeMap<>();
-        return new cElementalInstanceStackMap(map);
-    }
-
-    public void cleanUp(){
-        map.entrySet().removeIf(entry -> entry.getValue().amount < AVOGADRO_CONSTANT_UNCERTAINTY);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
deleted file mode 100644
index 020f5a5f8c..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalMutableDefinitionStackMap.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.util.DoubleCount.sub;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalMutableDefinitionStackMap extends cElementalStackMap {//Transient class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public cElementalMutableDefinitionStackMap() {
-        map = new TreeMap<>();
-    }
-
-    @Deprecated
-    public cElementalMutableDefinitionStackMap(iElementalDefinition... in) {
-        map=new TreeMap<>();
-        for (iElementalDefinition def : in) {
-            putUnify(new cElementalDefinitionStack(def, 1));
-        }
-    }
-
-    public cElementalMutableDefinitionStackMap(cElementalDefinitionStack... in) {
-        map=new TreeMap<>();
-        putUnifyAll(in);
-    }
-
-    public cElementalMutableDefinitionStackMap(TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        this(true, in);
-    }
-
-    public cElementalMutableDefinitionStackMap(boolean clone, TreeMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        if (clone) {
-            map = new TreeMap<>(in);
-        } else {
-            map = in;
-        }
-    }
-
-    @Override
-    public cElementalMutableDefinitionStackMap clone() {
-        return new cElementalMutableDefinitionStackMap(map);
-    }
-
-    public cElementalDefinitionStackMap toImmutable() {
-        return new cElementalDefinitionStackMap(map);
-    }
-    public cElementalDefinitionStackMap toImmutable_optimized_unsafeLeavesExposedElementalTree() {
-        return new cElementalDefinitionStackMap(this);
-    }
-
-    @Override
-    @Deprecated
-    public TreeMap<iElementalDefinition, cElementalDefinitionStack> getRawMap() {
-        return map;
-    }
-
-
-    //Removers
-    public void clear() {
-        map.clear();
-    }
-
-    public cElementalDefinitionStack remove(iElementalDefinition def) {
-        return map.remove(def);
-    }
-
-    @Deprecated
-    public cElementalDefinitionStack remove(iHasElementalDefinition has) {
-        return map.remove(has.getDefinition());
-    }
-
-    public void removeAll(iElementalDefinition... definitions) {
-        for (iElementalDefinition def : definitions) {
-            map.remove(def);
-        }
-    }
-
-    @Deprecated
-    public void removeAll(iHasElementalDefinition... hasElementalDefinition) {
-        for (iHasElementalDefinition has : hasElementalDefinition) {
-            map.remove(has.getDefinition());
-        }
-    }
-
-    //Remove amounts
-    public boolean removeAmount(boolean testOnly, cElementalInstanceStack instance) {
-        cElementalDefinitionStack target = map.get(instance.definition);
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= instance.amount;
-        } else {
-            double diff = sub(target.amount,instance.amount);
-            if (diff > 0) {
-                map.put(target.definition, new cElementalDefinitionStack(target.definition, diff));
-                return true;
-            } else if (diff == 0) {
-                map.remove(instance.definition);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean removeAmount(boolean testOnly, iHasElementalDefinition stack) {
-        cElementalDefinitionStack target = map.get(stack.getDefinition());
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.amount >= stack.getAmount();
-        } else {
-            double diff = sub(target.amount,stack.getAmount());
-            if (diff > 0) {
-                map.put(target.definition, new cElementalDefinitionStack(target.definition, diff));
-                return true;
-            } else if (diff == 0) {
-                map.remove(stack.getDefinition());
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Deprecated
-    public boolean removeAmount(boolean testOnly, iElementalDefinition def) {
-        return removeAmount(testOnly, new cElementalDefinitionStack(def, 1));
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStack... instances) {
-        boolean test = true;
-        for (cElementalInstanceStack stack : instances) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (cElementalInstanceStack stack : instances) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, iHasElementalDefinition... stacks) {
-        boolean test = true;
-        for (iHasElementalDefinition stack : stacks) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (iHasElementalDefinition stack : stacks) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    @Deprecated
-    public boolean removeAllAmounts(boolean testOnly, iElementalDefinition... definitions) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[definitions.length];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = new cElementalDefinitionStack(definitions[i], 1);
-        }
-        return removeAllAmounts(testOnly, stacks);
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry : container.map.entrySet()) {
-            removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStackMap container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : container.map.entrySet()) {
-            test &= removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    //Put replace
-    public cElementalDefinitionStack putReplace(cElementalDefinitionStack defStackUnsafe) {
-        return map.put(defStackUnsafe.definition, defStackUnsafe);
-    }
-
-    public void putReplaceAll(cElementalDefinitionStack... defStacks) {
-        for (cElementalDefinitionStack defStack : defStacks) {
-            map.put(defStack.definition, defStack);
-        }
-    }
-
-    public void putReplaceAll(cElementalStackMap inContainerUnsafe) {
-        map.putAll(inContainerUnsafe.map);
-    }
-
-    //Put unify
-    public cElementalDefinitionStack putUnify(cElementalDefinitionStack def) {
-        cElementalDefinitionStack stack=map.get(def.definition);
-        if(stack==null) {
-            return map.put(def.definition, def);
-        }
-        return map.put(def.definition, stack.addAmountIntoNewInstance(def.amount));
-    }
-
-    @Deprecated
-    public cElementalDefinitionStack putUnify(iElementalDefinition def) {
-        return putUnify(new cElementalDefinitionStack(def, 1));
-    }
-
-    public void putUnifyAll(cElementalDefinitionStack... defs) {
-        for (cElementalDefinitionStack def : defs) {
-            putUnify(def);
-        }
-    }
-
-    @Deprecated
-    public void putUnifyAll(iElementalDefinition... defs) {
-        for (iElementalDefinition def : defs) {
-            putUnify(def);
-        }
-    }
-
-    private void putUnifyAll(Map<iElementalDefinition, cElementalDefinitionStack> inTreeUnsafe) {
-        for (cElementalDefinitionStack in : inTreeUnsafe.values()) {
-            putUnify(in);
-        }
-    }
-
-    public void putUnifyAll(cElementalStackMap containerUnsafe) {
-        for (cElementalDefinitionStack in : containerUnsafe.map.values()) {
-            putUnify(in);
-        }
-    }
-
-    public static cElementalMutableDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalMutableDefinitionStackMap(defStacks);
-    }
-
-    public void cleanUp(){
-        for(Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry:map.entrySet()){
-            if(entry.getValue().amount<=0) {
-                map.remove(entry.getKey());
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java
deleted file mode 100644
index f8e7aa39e4..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/cElementalStackMap.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-abstract class cElementalStackMap implements Comparable<cElementalStackMap> {
-    protected TreeMap<iElementalDefinition, cElementalDefinitionStack> map;
-
-    @Override
-    public abstract cElementalStackMap clone();
-
-    @Deprecated
-    public abstract TreeMap<iElementalDefinition, cElementalDefinitionStack> getRawMap();
-
-    //Getters
-    public final cElementalDefinitionStack getFirst(){
-        return map.firstEntry().getValue();
-    }
-
-    public final cElementalDefinitionStack getLast(){
-        return map.lastEntry().getValue();
-    }
-
-    public final cElementalDefinitionStack getDefinitionStack(iElementalDefinition def) {
-        return map.get(def);
-    }
-
-    public String[] getShortSymbolsInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalDefinitionStack instance : map.values()) {
-            info[i++] = instance.definition.getShortSymbol();
-        }
-        return info;
-    }
-
-    public final String[] getElementalInfo() {
-        String[] info = new String[map.size() * 3];
-        int i = 0;
-        for (cElementalDefinitionStack defStack : map.values()) {
-            info[i] = EnumChatFormatting.BLUE + defStack.definition.getName();
-            info[i + 1] = EnumChatFormatting.AQUA + defStack.definition.getSymbol();
-            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.amount;
-            i += 3;
-        }
-        return info;
-    }
-
-    public final cElementalDefinitionStack[] values() {
-        Collection<cElementalDefinitionStack> var = map.values();
-        return var.toArray(new cElementalDefinitionStack[0]);
-    }
-
-    public final iElementalDefinition[] keys() {
-        Set<iElementalDefinition> var = map.keySet();
-        return var.toArray(new iElementalDefinition[0]);
-    }
-
-    public double getCountOfAllAmounts(){
-        double sum=0;
-        for(cElementalDefinitionStack stack:map.values()){
-            sum= add(sum,stack.amount);
-        }
-        return sum;
-    }
-
-    //Tests
-    public final boolean containsDefinition(iElementalDefinition def) {
-        return map.containsKey(def);
-    }
-
-    public final boolean containsDefinitionStack(cElementalDefinitionStack inst) {
-        return map.containsValue(inst);
-    }
-
-    public final int size() {
-        return map.size();
-    }
-
-    public final boolean hasStacks() {
-        return !map.isEmpty();
-    }
-
-    public final boolean isEmpty(){
-        return map.isEmpty();
-    }
-
-    //NBT
-    public final NBTTagCompound getShortSymbolsNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getShortSymbolsInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public final NBTTagCompound getInfoNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getElementalInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger("i", map.size());
-        int i = 0;
-        for (cElementalDefinitionStack defStack : map.values()) {
-            nbt.setTag(Integer.toString(i++), defStack.toNBT());
-        }
-        return nbt;
-    }
-
-    @Override
-    public final int compareTo(cElementalStackMap o) {//this actually compares rest
-        int sizeDiff = map.size() - o.map.size();
-        if (sizeDiff != 0) {
-            return sizeDiff;
-        }
-        cElementalDefinitionStack[] ofThis = values(), ofO = o.values();
-        for (int i = 0; i < ofO.length; i++) {
-            int result = ofThis[i].compareTo(ofO[i]);
-            if (result != 0) {
-                return result;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalStackMap) {
-            return compareTo((cElementalStackMap) obj) == 0;
-        }
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo(((cElementalInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public final int hashCode() {//Hash only definitions to compare contents not amounts or data
-        int hash = -(map.size() << 4);
-        for (cElementalDefinitionStack stack : map.values()) {
-            hash += stack.definition.hashCode();
-        }
-        return hash;
-    }
-
-    public double getMass(){
-        double mass=0;
-        for(cElementalDefinitionStack stack:map.values()){
-            mass+=stack.getMass();
-        }
-        return mass;
-    }
-
-    public long getCharge(){
-        long charge=0;
-        for(cElementalDefinitionStack stack:map.values()){
-            charge+=stack.getCharge();
-        }
-        return charge;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
index 912d44ff43..8b1f6d0c14 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -83,7 +83,7 @@ public class GiveEM implements ICommand {
             byte clazz = (byte) args.remove(0).charAt(0);
             Method constructor = cElementalDefinition.getBindsComplex().get(clazz);
 
-            cElementalMutableDefinitionStackMap stacks=new cElementalMutableDefinitionStackMap();
+            cElementalDefinitionStackMap stacks =new cElementalDefinitionStackMap();
             while(args.size()>0){
                 cElementalDefinitionStack tempStack=getDefinitionStack(args);
                 if(tempStack==null) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
new file mode 100644
index 0000000000..79103f7fa0
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
@@ -0,0 +1,77 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import static com.github.technus.tectech.util.DoubleCount.add;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class cElementalDecay {
+    public static final cElementalDecay[] noDecay = null;
+    //DECAY IMPOSSIBLE!!!
+    //Do not use regular NULL java will not make it work with varargs!!!
+    //Or cast null into ARRAY type but this static is more convenient!!!
+    public static final cElementalDecay[]          noProduct = new cElementalDecay[0];
+    //this in turn can be used to tell that the thing should just vanish
+    public final        cElementalConstantStackMap outputStacks;
+    public final        double                     probability;
+
+    public cElementalDecay(iElementalDefinition... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public cElementalDecay(double probability, iElementalDefinition... outSafe) {
+        cElementalDefinitionStack[] outArr = new cElementalDefinitionStack[outSafe.length];
+        for (int i = 0; i < outArr.length; i++) {
+            outArr[i] = new cElementalDefinitionStack(outSafe[i], 1D);
+        }
+        outputStacks = new cElementalConstantStackMap(outArr);
+        this.probability = probability;
+    }
+
+    public cElementalDecay(cElementalDefinitionStack... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public cElementalDecay(double probability, cElementalDefinitionStack... out) {
+        outputStacks = new cElementalConstantStackMap(out);
+        this.probability = probability;
+    }
+
+    public cElementalDecay(cElementalConstantStackMap tree) {
+        this(1D, tree);
+    }
+
+    public cElementalDecay(double probability, cElementalConstantStackMap tree) {
+        outputStacks = tree;
+        this.probability = probability;
+    }
+
+    public cElementalInstanceStackMap getResults(double lifeMult, double age, long energyTotalForProducts, double amountDecaying) {
+        cElementalInstanceStackMap decayResult = new cElementalInstanceStackMap();
+        if (outputStacks == null) {
+            return decayResult;//This is to prevent null pointer exceptions.
+        }
+        //Deny decay code is in instance!
+        double qtty = 0D;
+        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
+            qtty= add(qtty,stack.amount);
+        }
+        if (qtty <= 0D) {
+            return decayResult;
+        }
+        //energyTotalForProducts /= qtty;
+        //lifeMult /= (float) qtty;
+        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
+            decayResult.putUnify(new cElementalInstanceStack(stack.definition,
+                    amountDecaying * stack.amount,
+                    lifeMult, age/*new products*/, (long)(energyTotalForProducts / Math.max(1D, Math.abs(stack.amount)))));//get instances from stack
+        }
+        return decayResult;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
new file mode 100644
index 0000000000..43f4341720
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
@@ -0,0 +1,43 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+
+public class cElementalDecayResult {
+    private final cElementalInstanceStackMap output;
+    private       double                     massAffected;
+    private       double                     massDiff;
+
+    public cElementalDecayResult(cElementalInstanceStackMap output, double massAffected, double massDiff) {
+        this.output = output;
+        this.massAffected = massAffected;
+        this.massDiff = massDiff;
+    }
+
+    public cElementalInstanceStackMap getOutput() {
+        return output;
+    }
+
+    /**
+     * How much was lost in the process (decayed or removed)
+     * @return
+     */
+    public double getMassAffected() {
+        return massAffected;
+    }
+
+    /**
+     * Difference of mass of actually decayed elements
+     * @return
+     */
+    public double getMassDiff() {
+        return massDiff;
+    }
+
+    public void setMassAffected(double massAffected) {
+        this.massAffected = massAffected;
+    }
+
+    public void setMassDiff(double massDiff) {
+        this.massDiff = massDiff;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
new file mode 100644
index 0000000000..457a37f7b9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
@@ -0,0 +1,12 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+
+/**
+ * Created by danie_000 on 25.01.2017.
+ */
+public interface iElementalContainer {
+    cElementalInstanceStackMap getContentHandler();
+
+    void purgeOverflow();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java
deleted file mode 100644
index 20fe1ffc5b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalInstanceContainer.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-/**
- * Created by danie_000 on 25.01.2017.
- */
-public interface iElementalInstanceContainer extends Cloneable {
-    cElementalInstanceStackMap getContainerHandler();
-
-    void purgeOverflow();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
new file mode 100644
index 0000000000..cde1d55561
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
@@ -0,0 +1,58 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.Collections;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+public final class cElementalConstantStackMap/*IMMUTABLE*/ extends cElementalStackMap<cElementalDefinitionStack> {//Target class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public static final cElementalConstantStackMap EMPTY = new cElementalConstantStackMap();
+
+    private cElementalConstantStackMap() {
+        super(Collections.emptyNavigableMap());
+    }
+
+    public cElementalConstantStackMap(cElementalDefinitionStack... in) {
+        this(new cElementalDefinitionStackMap(in).map);
+    }
+
+    public cElementalConstantStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
+        super(Collections.unmodifiableNavigableMap(in));
+    }
+
+    @Override
+    public Class<cElementalDefinitionStack> getType() {
+        return cElementalDefinitionStack.class;
+    }
+
+    //IMMUTABLE DON'T NEED IT
+    @Override
+    public cElementalConstantStackMap clone() {
+        return this;
+    }
+
+    public cElementalDefinitionStackMap toMutable() {
+        return new cElementalDefinitionStackMap(new TreeMap<>(map));
+    }
+
+    public static cElementalConstantStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
+        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].definition.equals(nbtE__)) {
+                throw new tElementalException("Something went Wrong");
+            }
+        }
+        return new cElementalConstantStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
new file mode 100644
index 0000000000..1273119bb3
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
@@ -0,0 +1,56 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class cElementalDefinitionStackMap extends cElementalStackMap<cElementalDefinitionStack> implements iElementalMapRW<cElementalDefinitionStack> {//Transient class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public cElementalDefinitionStackMap() {}
+
+    public cElementalDefinitionStackMap(cElementalDefinitionStack... in) {
+        putUnifyAll(in);
+    }
+
+    public cElementalDefinitionStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
+        super(in);
+    }
+
+    @Override
+    public Class<cElementalDefinitionStack> getType() {
+        return cElementalDefinitionStack.class;
+    }
+
+    @Override
+    public cElementalDefinitionStackMap clone() {
+        return new cElementalDefinitionStackMap(new TreeMap<>(map));
+    }
+
+    public cElementalConstantStackMap toImmutable() {
+        return new cElementalConstantStackMap(new TreeMap<>(map));
+    }
+
+    public cElementalConstantStackMap toImmutable_optimized_unsafe_LeavesExposedElementalTree() {
+        return new cElementalConstantStackMap(map);
+    }
+
+    public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
+        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].definition.equals(nbtE__)) {
+                throw new tElementalException("Something went Wrong");
+            }
+        }
+        return new cElementalDefinitionStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
new file mode 100644
index 0000000000..aab1f93990
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
@@ -0,0 +1,214 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.util.DoubleCount.add;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class cElementalInstanceStackMap extends cElementalStackMap<cElementalInstanceStack> implements iElementalMapRW<cElementalInstanceStack> {
+    //Constructors
+    public cElementalInstanceStackMap() {}
+
+    public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) {
+        this(true, inSafe);
+    }
+
+    public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) {
+        if (clone) {
+            cElementalInstanceStack[] stacks=new cElementalInstanceStack[in.length];
+            for(int i=0;i<stacks.length;i++) {
+                stacks[i] = in[i].clone();
+            }
+            putUnifyAll(stacks);
+        } else {
+            putUnifyAll(in);
+        }
+    }
+
+    private cElementalInstanceStackMap(NavigableMap<iElementalDefinition, cElementalInstanceStack> inSafe) {
+        this(true, inSafe);
+    }
+
+    private cElementalInstanceStackMap(boolean clone, NavigableMap<iElementalDefinition, cElementalInstanceStack> in) {
+        if (clone) {
+            map = new TreeMap<>();
+            for(cElementalInstanceStack stack:in.values()) {
+                putUnify(stack.clone());
+            }
+        } else {
+            map = in;
+        }
+    }
+
+    @Override
+    public Class<cElementalInstanceStack> getType() {
+        return cElementalInstanceStack.class;
+    }
+
+    @Override
+    public cElementalInstanceStackMap clone() {
+        return new cElementalInstanceStackMap(map);
+    }
+
+    //Remove overflow
+    public double removeOverflow(int stacksCount, double stackCapacity) {
+        double massRemoved = 0;
+
+        if (map.size() > stacksCount) {
+            iElementalDefinition[] keys = keySetToArray();
+            for (int i = stacksCount; i < keys.length; i++) {
+                massRemoved += map.get(keys[i]).getDefinitionStack().getMass();
+                map.remove(keys[i]);
+            }
+        }
+
+        for (cElementalInstanceStack instance : valuesToArray()) {
+            if (instance.amount > stackCapacity) {
+                massRemoved += instance.definition.getMass() * (instance.amount - stackCapacity);
+                instance.amount = stackCapacity;
+            }
+        }
+        return massRemoved;
+    }
+
+    //Getters
+    public String[] getElementalInfo() {
+        String[] info = new String[map.size()];
+        int i = 0;
+        for (cElementalInstanceStack instance : map.values()) {
+            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName()+
+                    " "+ EnumChatFormatting.AQUA + instance.definition.getSymbol()+ EnumChatFormatting.RESET+
+                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E",instance.amount/ AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
+                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
+                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
+        }
+        return info;
+    }
+
+    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
+            e.getValue().addScanShortSymbols(list,capabilities);
+        }
+        return list;
+    }
+
+    public ArrayList<String> getScanInfo(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
+            e.getValue().addScanResults(list,capabilities);
+        }
+        return list;
+    }
+
+    //Tick Content
+    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
+        return tickContent(lifeTimeMult,postEnergize,1D);
+    }
+
+    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
+        cleanUp();
+        double diff=0;
+        for (cElementalInstanceStack instance : valuesToArray()) {
+            cElementalDecayResult newInstances = instance.decay(lifeTimeMult, instance.age += seconds, postEnergize);
+            if (newInstances == null) {
+                instance.nextColor();
+            } else {
+                diff=add(diff,newInstances.getMassDiff());
+                removeAmount(false,instance);
+                putUnifyAll(newInstances.getOutput());
+            }
+        }
+        return diff;
+    }
+
+    //NBT
+    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanShortSymbols(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanInfo(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public static cElementalInstanceStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
+        cElementalInstanceStack[] instances = new cElementalInstanceStack[nbt.getInteger("i")];
+        for (int i = 0; i < instances.length; i++) {
+            instances[i] = cElementalInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (instances[i].definition.equals(nbtE__)) {
+                throw new tElementalException("Something went Wrong");
+            }
+        }
+        return new cElementalInstanceStackMap(false, instances);
+    }
+
+    //stackUp
+    public static cElementalInstanceStack[] stackUp(cElementalInstanceStack... in) {
+        cElementalInstanceStackMap inTree = new cElementalInstanceStackMap();
+        inTree.putUnifyAll(in);
+        return inTree.valuesToArray();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof cElementalInstanceStackMap) {
+            return compareTo((cElementalInstanceStackMap) obj) == 0;
+        }
+        if (obj instanceof cElementalStackMap) {
+            return toDefinitionMapForComparison().compareTo((cElementalStackMap) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder build=new StringBuilder("Instance Stack Map\n");
+        for(cElementalInstanceStack stack:map.values()){
+            build.append(stack.toString()).append('\n');
+        }
+        return build.toString();
+    }
+
+    public cElementalInstanceStackMap takeAll(){
+        cElementalInstanceStackMap newStack=new cElementalInstanceStackMap(false,new TreeMap<>(this.map));//just in case to uncouple The map
+        this.map.clear();
+        return newStack;
+    }
+
+    public cElementalDefinitionStackMap toDefinitionMapForComparison() {
+        cElementalDefinitionStack[] list = new cElementalDefinitionStack[size()];
+        int                         i    = 0;
+        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : entrySet()) {
+            cElementalInstanceStack value = entry.getValue();
+            list[i++] = new cElementalDefinitionStack(value.getDefinition(), value.getAmount());
+        }
+        return new cElementalDefinitionStackMap(list);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
new file mode 100644
index 0000000000..2b144df128
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
@@ -0,0 +1,50 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+abstract class cElementalStackMap<T extends iElementalStack> implements iElementalMapR<T> {
+    protected NavigableMap<iElementalDefinition, T> map;
+
+    protected cElementalStackMap() {
+        this(new TreeMap<>());
+    }
+
+    protected cElementalStackMap(NavigableMap<iElementalDefinition, T> map) {
+        this.map = map;
+    }
+
+    @Override
+    public NavigableMap<iElementalDefinition, T> getBackingMap() {
+        return map;
+    }
+
+    @Override
+    public abstract cElementalStackMap<T> clone();
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof cElementalInstanceStackMap) {
+            return compareTo(((cElementalInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
+        }
+        if (obj instanceof cElementalStackMap) {
+            return compareTo((cElementalStackMap) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Hash only definitions to compare contents not amounts or data
+        int hash = -(map.size() << 4);
+        for (T stack : map.values()) {
+            hash += stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
new file mode 100644
index 0000000000..0491c43ebc
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
@@ -0,0 +1,187 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.lang.reflect.Array;
+import java.util.*;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+
+public interface iElementalMapR<T extends iElementalStack> extends Comparable<iElementalMapR<? extends iElementalStack>>, Cloneable {
+    NavigableMap<iElementalDefinition,T> getBackingMap();
+
+    iElementalMapR<T> clone();
+
+    default Set<Map.Entry<iElementalDefinition, T>> entrySet(){
+        return getBackingMap().entrySet();
+    }
+
+    default Set<iElementalDefinition> keySet(){
+        return getBackingMap().keySet();
+    }
+
+    default iElementalDefinition[] keySetToArray() {
+        return keySetToArray(new iElementalDefinition[size()]);
+    }
+
+    default iElementalDefinition[] keySetToArray(iElementalDefinition[] array) {
+        return getBackingMap().keySet().toArray(array);
+    }
+
+    default Collection<T> values(){
+        return getBackingMap().values();
+    }
+
+    @SuppressWarnings("unchecked")
+    default T[] valuesToArray(){
+        return valuesToArray((T[]) Array.newInstance(getType(),size()));
+    }
+
+    default T[] valuesToArray(T[] array){
+        return getBackingMap().values().toArray(array);
+    }
+
+    Class<T> getType();
+
+    //Getters
+    default T getFirst(){
+        return getBackingMap().firstEntry().getValue();
+    }
+
+    default T getLast(){
+        return getBackingMap().lastEntry().getValue();
+    }
+
+    default T get(iElementalDefinition def) {
+        return getBackingMap().get(def);
+    }
+
+    default T getNaturallySorted(int pos) {
+        if(pos<0 || pos>=size()){
+            throw new IndexOutOfBoundsException("Index was: "+pos+" size was: "+size());
+        }
+        for (Map.Entry<iElementalDefinition, T> entry : entrySet()) {
+            if(pos==0){
+                return entry.getValue();
+            }
+            pos--;
+        }
+        return null;
+    }
+
+    default T getRandom() {
+        return getNaturallySorted(TecTech.RANDOM.nextInt(size()));
+    }
+
+    default String[] getShortSymbolsInfo() {
+        String[] info = new String[size()];
+        int i = 0;
+        for (T instance : values()) {
+            info[i++] = instance.getDefinition().getShortSymbol();
+        }
+        return info;
+    }
+
+    default String[] getElementalInfo() {
+        String[] info = new String[size() * 3];
+        int i = 0;
+        for (T defStack : values()) {
+            info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getName();
+            info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
+            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
+            i += 3;
+        }
+        return info;
+    }
+
+    //NBT
+    default NBTTagCompound getShortSymbolsNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getShortSymbolsInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound getInfoNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getElementalInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setInteger("i", size());
+        int i = 0;
+        for (T stack : values()) {
+            nbt.setTag(Integer.toString(i++), stack.toNBT());
+        }
+        return nbt;
+    }
+
+    @Override
+    default int compareTo(iElementalMapR<? extends iElementalStack> o) {//this actually compares rest
+        int sizeDiff = size() - o.size();
+        if (sizeDiff != 0) {
+            return sizeDiff;
+        }
+
+        Iterator<T> iterator = values().iterator();
+        Iterator<? extends iElementalStack> iteratorO = o.values().iterator();
+
+        while (iterator.hasNext()) {
+            int result = iterator.next().compareTo(iteratorO.next());
+            if (result != 0) {
+                return result;
+            }
+        }
+        return 0;
+    }
+
+    default double getMass(){
+        double mass=0;
+        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
+            mass+=entry.getValue().getMass();
+        }
+        return mass;
+    }
+
+    default long getCharge(){
+        long charge=0;
+        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
+            charge+=entry.getValue().getCharge();
+        }
+        return charge;
+    }
+
+    //Tests
+    default boolean containsKey(iElementalDefinition def) {
+        return getBackingMap().containsKey(def);
+    }
+
+    default boolean containsKey(iElementalStack def) {
+        return containsKey(def.getDefinition());
+    }
+
+    default int size() {
+        return getBackingMap().size();
+    }
+
+    default boolean hasStacks() {
+        return !isEmpty();
+    }
+
+    default boolean isEmpty(){
+        return getBackingMap().isEmpty();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
new file mode 100644
index 0000000000..7f8d314858
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
@@ -0,0 +1,130 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+
+import java.util.Map;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
+import static com.github.technus.tectech.util.DoubleCount.sub;
+
+public interface iElementalMapRW<T extends iElementalStack> extends iElementalMapR<T> {
+    iElementalMapRW<T> clone();
+
+    default void cleanUp(){
+        getBackingMap().entrySet().removeIf(entry -> entry.getValue().getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY);
+    }
+
+    default void clear() {
+        getBackingMap().clear();
+    }
+
+    //Remove
+    default T remove(iElementalDefinition def) {
+        return getBackingMap().remove(def);
+    }
+
+    default T remove(iElementalStack has) {
+        return remove(has.getDefinition());
+    }
+
+    default void removeAll(iElementalDefinition... definitions) {
+        for (iElementalDefinition def : definitions) {
+            getBackingMap().remove(def);
+        }
+    }
+
+    default void removeAll(iElementalStack... hasElementalDefinition) {
+        for (iElementalStack has : hasElementalDefinition) {
+            getBackingMap().remove(has.getDefinition());
+        }
+    }
+
+    default boolean removeAmount(boolean testOnly, iElementalStack stack) {
+        return removeAmount(testOnly,stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean removeAmount(boolean testOnly, iElementalDefinition def,double amount) {
+        T target = getBackingMap().get(def);
+        if (target == null) {
+            return false;
+        }
+        if (testOnly) {
+            return target.getAmount() >= amount;
+        } else {
+            double newAmount = sub(target.getAmount(),amount);
+            if (newAmount > 0) {
+                getBackingMap().put(target.getDefinition(), (T)target.mutateAmount(newAmount));
+                return true;
+            } else if (newAmount == 0) {
+                getBackingMap().remove(def);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    default boolean removeAllAmounts(boolean testOnly, iElementalStack... stacks) {
+        boolean test = true;
+        for (iElementalStack stack : stacks) {
+            test &= removeAmount(true, stack);
+        }
+        if (testOnly || !test) {
+            return test;
+        }
+        for (iElementalStack stack : stacks) {
+            removeAmount(false, stack);
+        }
+        return true;
+    }
+
+    default boolean removeAllAmounts(boolean testOnly, iElementalMapR<? extends iElementalStack> container) {
+        boolean test=true;
+        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
+            test &= removeAmount(true, entry.getValue());
+        }
+        if (testOnly || !test) {
+            return test;
+        }
+        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
+            removeAmount(false, entry.getValue());
+        }
+        return true;
+    }
+
+    //Put replace
+    default T putReplace(T defStackUnsafe) {
+        return getBackingMap().put(defStackUnsafe.getDefinition(), defStackUnsafe);
+    }
+
+    default void putReplaceAll(T... defStacks) {
+        for (T defStack : defStacks) {
+            getBackingMap().put(defStack.getDefinition(), defStack);
+        }
+    }
+
+    default void putReplaceAll(iElementalMapR<T> inContainerUnsafe) {
+        getBackingMap().putAll(inContainerUnsafe.getBackingMap());
+    }
+
+    //Put unify
+    default T putUnify(T def) {
+        T stack=getBackingMap().get(def.getDefinition());
+        if(stack==null) {
+            return getBackingMap().put(def.getDefinition(), def);
+        }
+        return getBackingMap().put(def.getDefinition(), (T)stack.mutateAmount(def.getAmount()+stack.getAmount()));
+    }
+
+    default void putUnifyAll(T... defs) {
+        for (T def : defs) {
+            putUnify(def);
+        }
+    }
+
+    default void putUnifyAll(iElementalMapR<T> inTreeUnsafe) {
+        for (T in : inTreeUnsafe.values()) {
+            putUnify(in);
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java
deleted file mode 100644
index e191cc0e0a..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipe.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipe implements Comparable<rElementalRecipe> {
-    public final short ID;
-    public final cElementalDefinitionStackMap inEM;
-    public final cElementalDefinitionStackMap outEM;
-    public final ItemStack[] outItems;
-    public final FluidStack[] outFluids;
-    public Object[] extension;
-
-    public rElementalRecipe(
-            cElementalDefinitionStackMap inEM,//not null plz
-            short id,
-            cElementalDefinitionStackMap outEM,
-            ItemStack[] outItems,
-            FluidStack[] outFluids) {
-        this.inEM = inEM;
-        this.outEM = outEM;
-        this.outItems = outItems;
-        this.outFluids = outFluids;
-        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
-    }
-
-    public rElementalRecipe extend(Object... data) {
-        extension = data;
-        return this;
-    }
-
-    @Override
-    public int compareTo(rElementalRecipe o) {
-        int compare = inEM.compareTo(o.inEM);
-        if(compare!=0) {
-            return compare;
-        }
-        return Short.compare(ID, o.ID);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof rElementalRecipe) {
-            return compareTo((rElementalRecipe) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return inEM.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java
deleted file mode 100644
index ed5e46f43f..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/rElementalRecipeMap.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipeMap {//TODO FIX
-    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
-    private final HashMap<cElementalDefinitionStackMap, HashMap<Short, rElementalRecipe>> recipes;
-
-    public rElementalRecipeMap() {
-        recipes = new HashMap<>();
-    }
-
-    public rElementalRecipe put(rElementalRecipe in) {
-        HashMap<Short, rElementalRecipe> r = recipes.computeIfAbsent(in.inEM, k -> new HashMap<>());
-        return r.put(in.ID, in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
-        //It is either bad, or unimportant if you use different id's
-    }
-
-    public void putAll(rElementalRecipe... contents) {
-        for (rElementalRecipe recipe : contents) {
-            put(recipe);
-        }
-    }
-
-    public rElementalRecipe remove(cElementalStackMap map, short id) {
-        return recipes.get(map).remove(id);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> remove(cElementalStackMap map) {
-        return recipes.remove(map);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> findExact(cElementalInstanceStackMap in) {
-        return recipes.get(in.toDefinitionMapForComparison());//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
-    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findExact(cElementalStackMap in) {
-        return recipes.get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //this does check if the map contains all the requirements for any recipe, and the required amounts
-    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalMutableDefinitionStackMap in, boolean testOnlyTruePreferred) {
-        for (Map.Entry<cElementalDefinitionStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnlyTruePreferred, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalInstanceStackMap in, boolean testOnly) {
-        for (Map.Entry<cElementalDefinitionStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnly, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    //To check for instance data and other things use recipe extensions!
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
new file mode 100644
index 0000000000..8c0fb40a4b
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
@@ -0,0 +1,57 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class rElementalRecipe implements Comparable<rElementalRecipe> {
+    public final short                      ID;
+    public final cElementalConstantStackMap inEM;
+    public final cElementalConstantStackMap outEM;
+    public final ItemStack[]                outItems;
+    public final FluidStack[] outFluids;
+    public Object[] extension;
+
+    public rElementalRecipe(
+            cElementalConstantStackMap inEM,//not null plz
+            short id,
+            cElementalConstantStackMap outEM,
+            ItemStack[] outItems,
+            FluidStack[] outFluids) {
+        this.inEM = inEM;
+        this.outEM = outEM;
+        this.outItems = outItems;
+        this.outFluids = outFluids;
+        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
+    }
+
+    public rElementalRecipe extend(Object... data) {
+        extension = data;
+        return this;
+    }
+
+    @Override
+    public int compareTo(rElementalRecipe o) {
+        int compare = inEM.compareTo(o.inEM);
+        if(compare!=0) {
+            return compare;
+        }
+        return Short.compare(ID, o.ID);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof rElementalRecipe) {
+            return compareTo((rElementalRecipe) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return inEM.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
new file mode 100644
index 0000000000..56a9030354
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
@@ -0,0 +1,73 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.*;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class rElementalRecipeMap {//TODO FIX
+    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
+    private final HashMap<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> recipes;
+
+    public rElementalRecipeMap() {
+        recipes = new HashMap<>();
+    }
+
+    public rElementalRecipe put(rElementalRecipe in) {
+        HashMap<Short, rElementalRecipe> r = recipes.computeIfAbsent(in.inEM, k -> new HashMap<>());
+        return r.put(in.ID, in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
+        //It is either bad, or unimportant if you use different id's
+    }
+
+    public void putAll(rElementalRecipe... contents) {
+        for (rElementalRecipe recipe : contents) {
+            put(recipe);
+        }
+    }
+
+    public rElementalRecipe remove(iElementalMapR<cElementalDefinitionStack> map, short id) {
+        return recipes.get(map).remove(id);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    public HashMap<Short, rElementalRecipe> remove(iElementalMapR<cElementalDefinitionStack> map) {
+        return recipes.remove(map);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    public HashMap<Short, rElementalRecipe> findExact(cElementalInstanceStackMap in) {
+        return recipes.get(in.toDefinitionMapForComparison());//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
+    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
+    @Deprecated
+    public HashMap<Short, rElementalRecipe> findExact(iElementalMapR<cElementalDefinitionStack> in) {
+        return recipes.get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //this does check if the map contains all the requirements for any recipe, and the required amounts
+    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
+    @Deprecated
+    public HashMap<Short, rElementalRecipe> findMatch(cElementalDefinitionStackMap in, boolean testOnlyTruePreferred) {
+        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
+            if (in.removeAllAmounts(testOnlyTruePreferred, cElementalDefinitionStackMapHashMapEntry.getKey())) {
+                return cElementalDefinitionStackMapHashMapEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    public HashMap<Short, rElementalRecipe> findMatch(cElementalInstanceStackMap in, boolean testOnly) {
+        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
+            if (in.removeAllAmounts(testOnly, cElementalDefinitionStackMapHashMapEntry.getKey())) {
+                return cElementalDefinitionStackMapHashMapEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    //To check for instance data and other things use recipe extensions!
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
index a2d22c30ed..1e03c8130f 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
@@ -5,12 +5,11 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElem
 import net.minecraft.nbt.NBTTagCompound;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-import static com.github.technus.tectech.util.DoubleCount.add;
 
 /**
  * Created by danie_000 on 20.11.2016.
  */
-public final class cElementalDefinitionStack implements iHasElementalDefinition {
+public final class cElementalDefinitionStack implements iElementalStack {
     public final iElementalDefinition definition;
     public final double amount;
 
@@ -24,6 +23,14 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
         return this;//IMMUTABLE
     }
 
+    @Override
+    public cElementalDefinitionStack mutateAmount(double amount) {
+        if(this.amount==amount){
+            return this;
+        }
+        return new cElementalDefinitionStack(definition,amount);//IMMUTABLE
+    }
+
     @Override
     public iElementalDefinition getDefinition() {
         return definition;//IMMUTABLE
@@ -57,26 +64,8 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
                 nbt.getLong("q")+nbt.getDouble("Q"));
     }
 
-    public cElementalDefinitionStack addAmountIntoNewInstance(double amount) {
-        if(amount==0) {
-            return this;
-        }
-        return new cElementalDefinitionStack(definition, add(amount,this.amount));
-    }
-
-    public cElementalDefinitionStack addAmountIntoNewInstance(cElementalDefinitionStack... other) {
-        if (other == null || other.length == 0) {
-            return this;
-        }
-        double l = 0;
-        for (cElementalDefinitionStack stack : other) {
-            l= add(l,stack.amount);
-        }
-        return addAmountIntoNewInstance(l);
-    }
-
     @Override
-    public int compareTo(iHasElementalDefinition o) {
+    public int compareTo(iElementalStack o) {
         return definition.compareTo(o.getDefinition());
     }
 
@@ -85,8 +74,8 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition
         if (obj instanceof iElementalDefinition) {
             return definition.compareTo((iElementalDefinition) obj) == 0;
         }
-        if (obj instanceof iHasElementalDefinition) {
-            return definition.compareTo(((iHasElementalDefinition) obj).getDefinition()) == 0;
+        if (obj instanceof iElementalStack) {
+            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
         }
         return false;
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
index 559d7ab8d9..1c06e560db 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
@@ -1,10 +1,10 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.util.Util;
@@ -24,7 +24,7 @@ import static java.lang.Math.*;
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class cElementalInstanceStack implements iHasElementalDefinition {
+public final class cElementalInstanceStack implements iElementalStack {
     public static int MIN_MULTIPLE_DECAY_CALLS=4,MAX_MULTIPLE_DECAY_CALLS=16;
     public static double DECAY_CALL_PER=AVOGADRO_CONSTANT;//todo
 
@@ -81,6 +81,12 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         return new cElementalInstanceStack(this);
     }
 
+    @Override
+    public cElementalInstanceStack mutateAmount(double amount) {
+        this.amount = amount;
+        return this;
+    }
+
     @Override
     public double getAmount() {
         return amount;
@@ -170,7 +176,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         if (newInstances == null) {
             nextColor();
         } else {
-            for (cElementalInstanceStack newInstance : newInstances.getOutput().values()) {
+            for (cElementalInstanceStack newInstance : newInstances.getOutput().valuesToArray()) {
                 newInstance.nextColor();
             }
         }
@@ -290,20 +296,20 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
             cElementalInstanceStackMap output = decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, amount);
             if(newProductsAge<0){
                 if(output.size()==1) {
-                    if(output.size()==1 && output.get(0).definition.equals(definition)) {
-                        output.get(0).setEnergy(energy);
-                        output.get(0).age=age;
+                    if(output.size()==1 && output.getFirst().definition.equals(definition)) {
+                        output.getFirst().setEnergy(energy);
+                        output.getFirst().age=age;
                     }
                 }else {
-                    for (cElementalInstanceStack stack : output.values()) {
+                    for (cElementalInstanceStack stack : output.valuesToArray()) {
                         if (stack.definition.equals(definition)) {
                             stack.age = age;
                         }
                     }
                 }
             }else{
-                if(output.size()==1 && output.get(0).definition.equals(definition)) {
-                    output.get(0).setEnergy(energy);
+                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
+                    output.getFirst().setEnergy(energy);
                 }
             }
             if(energy <= 0 && output.getMass() > mass){
@@ -390,20 +396,20 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
             }
 
             if(newProductsAge<0) {
-                if (output.size() == 1 && output.get(0).definition.equals(definition)) {
-                    output.get(0).setEnergy(energy);
-                    output.get(0).age = age;
+                if (output.size() == 1 && output.getFirst().definition.equals(definition)) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().age = age;
                 } else {
-                    for (cElementalInstanceStack stack : output.values()) {
+                    for (cElementalInstanceStack stack : output.valuesToArray()) {
                         if (stack.definition.equals(definition)) {
                             stack.age = age;
                         }
                     }
                 }
             }else{
-                if(output.size()==1 && output.get(0).definition.equals(definition)) {
-                    output.get(0).setEnergy(energy);
-                    output.get(0).age=age;
+                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().age=age;
                 }
             }
             if(energy <= 0 && output.getMass() > getMass()){
@@ -491,10 +497,10 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         scanContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
     }
 
-    private void scanContents(ArrayList<String> lines, cElementalDefinitionStackMap definitions, int depth, int[] detailsOnDepthLevels){
+    private void scanContents(ArrayList<String> lines, cElementalConstantStackMap definitions, int depth, int[] detailsOnDepthLevels){
         if(definitions!=null && depth<detailsOnDepthLevels.length){
             int deeper=depth+1;
-            for(cElementalDefinitionStack definitionStack:definitions.values()) {
+            for(cElementalDefinitionStack definitionStack:definitions.valuesToArray()) {
                 lines.add("");//def separator
                 if(Util.areBitsSet(SCAN_GET_DEPTH_LEVEL,detailsOnDepthLevels[depth])) {
                     lines.add("DEPTH = " + depth);
@@ -532,7 +538,7 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
     }
 
     @Override
-    public int compareTo(iHasElementalDefinition o) {//use for unification
+    public int compareTo(iElementalStack o) {//use for unification
         return definition.compareTo(o.getDefinition());
     }
 
@@ -541,8 +547,8 @@ public final class cElementalInstanceStack implements iHasElementalDefinition {
         if (obj instanceof iElementalDefinition) {
             return definition.compareTo((iElementalDefinition) obj) == 0;
         }
-        if (obj instanceof iHasElementalDefinition) {
-            return definition.compareTo(((iHasElementalDefinition) obj).getDefinition()) == 0;
+        if (obj instanceof iElementalStack) {
+            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
         }
         return false;
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
new file mode 100644
index 0000000000..65f2ed3b78
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
@@ -0,0 +1,23 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Created by danie_000 on 30.01.2017.
+ */
+public interface iElementalStack extends Comparable<iElementalStack>,Cloneable {
+    iElementalDefinition getDefinition();
+
+    double getAmount();
+
+    double getCharge();
+
+    double getMass();
+
+    iElementalStack clone();
+
+    iElementalStack mutateAmount(double amount);
+
+    NBTTagCompound toNBT();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java
deleted file mode 100644
index 1d8af7bab7..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iHasElementalDefinition.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-/**
- * Created by danie_000 on 30.01.2017.
- */
-public interface iHasElementalDefinition extends Comparable<iHasElementalDefinition>,Cloneable {
-    iElementalDefinition getDefinition();
-
-    double getAmount();
-
-    double getCharge();
-
-    double getMass();
-
-    iHasElementalDefinition clone();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
index 51025148a7..43e42df988 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.lang.reflect.Method;
@@ -62,7 +62,7 @@ public abstract class cElementalDefinition extends iElementalDefinition {
         //only of the internal def stacks!!!
         //that allows neat check if the same thing and
         //top hierarchy amount can be used to store amount info
-        return compareInnerContentsWithAmounts(getSubParticles().values(), o.getSubParticles().values());
+        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
     }
 
     //use only for nested operations!
@@ -112,8 +112,8 @@ public abstract class cElementalDefinition extends iElementalDefinition {
         if (obj instanceof iElementalDefinition) {
             return compareTo((iElementalDefinition) obj) == 0;
         }
-        if (obj instanceof iHasElementalDefinition) {
-            return compareTo(((iHasElementalDefinition) obj).getDefinition()) == 0;
+        if (obj instanceof iElementalStack) {
+            return compareTo(((iElementalStack) obj).getDefinition()) == 0;
         }
         return false;
     }
@@ -121,7 +121,7 @@ public abstract class cElementalDefinition extends iElementalDefinition {
     @Override
     public int hashCode() {//Internal amounts should be also hashed
         int hash = -(getSubParticles().size() << 4);
-        for (cElementalDefinitionStack stack : getSubParticles().values()) {
+        for (cElementalDefinitionStack stack : getSubParticles().valuesToArray()) {
             int amount=(int)stack.amount;
             hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.definition.hashCode();
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
index 6ee8591c58..70af6445c9 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
@@ -169,7 +169,7 @@ public abstract class cElementalPrimitive extends cElementalDefinition {
     }
 
     @Override
-    public final cElementalDefinitionStackMap getSubParticles() {
+    public final cElementalConstantStackMap getSubParticles() {
         return null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
index 90ac2eb339..8065e9c170 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
@@ -64,7 +64,7 @@ public abstract class iElementalDefinition implements Comparable<iElementalDefin
 
     public abstract boolean isTimeSpanHalfLife();
 
-    public abstract cElementalDefinitionStackMap getSubParticles();//contents... null if none
+    public abstract cElementalConstantStackMap getSubParticles();//contents... null if none
 
     public abstract aFluidDequantizationInfo someAmountIntoFluidStack();
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
index 3d8b7a881f..0d91b57ed5 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
@@ -1,28 +1,28 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aFluidDequantizationInfo implements iExchangeInfo<iHasElementalDefinition,FluidStack> {
-    private final iHasElementalDefinition in;
-    private final FluidStack out;
+public class aFluidDequantizationInfo implements iExchangeInfo<iElementalStack,FluidStack> {
+    private final iElementalStack in;
+    private final FluidStack      out;
 
-    public aFluidDequantizationInfo(iHasElementalDefinition emIn, FluidStack fluidStackOut){
+    public aFluidDequantizationInfo(iElementalStack emIn, FluidStack fluidStackOut){
         in=emIn;
         out=fluidStackOut;
     }
 
-    public aFluidDequantizationInfo(iHasElementalDefinition emIn, Fluid fluid, int fluidAmount){
+    public aFluidDequantizationInfo(iElementalStack emIn, Fluid fluid, int fluidAmount){
         in=emIn;
         out=new FluidStack(fluid,fluidAmount);
     }
 
     @Override
-    public iHasElementalDefinition input() {
+    public iElementalStack input() {
         return in.clone();//MEH!
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
index 563b87f8ee..39e4ec4671 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
@@ -1,22 +1,22 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack,iHasElementalDefinition> {
-    private final FluidStack in;
-    private final iHasElementalDefinition out;
+public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack, iElementalStack> {
+    private final FluidStack      in;
+    private final iElementalStack out;
 
-    public aFluidQuantizationInfo(FluidStack fluidStackIn, iHasElementalDefinition emOut){
+    public aFluidQuantizationInfo(FluidStack fluidStackIn, iElementalStack emOut){
         in=fluidStackIn;
         out=emOut;
     }
 
-    public aFluidQuantizationInfo(Fluid fluid, int fluidAmount, iHasElementalDefinition emOut){
+    public aFluidQuantizationInfo(Fluid fluid, int fluidAmount, iElementalStack emOut){
         in=new FluidStack(fluid,fluidAmount);
         out=emOut;
     }
@@ -27,7 +27,7 @@ public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack,iHasElem
     }
 
     @Override
-    public iHasElementalDefinition output() {
+    public iElementalStack output() {
         return out.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
index 8b42c61d6c..fb71275276 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_OreDictUnificator;
@@ -9,22 +9,22 @@ import net.minecraft.item.ItemStack;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aItemDequantizationInfo implements iExchangeInfo<iHasElementalDefinition,ItemStack> {
-    private final iHasElementalDefinition in;
-    private final ItemStack out;
+public class aItemDequantizationInfo implements iExchangeInfo<iElementalStack,ItemStack> {
+    private final iElementalStack in;
+    private final ItemStack       out;
 
-    public aItemDequantizationInfo(iHasElementalDefinition emIn, ItemStack itemStackOut){
+    public aItemDequantizationInfo(iElementalStack emIn, ItemStack itemStackOut){
         in=emIn;
         out=itemStackOut;
     }
 
-    public aItemDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, Materials material, int amount) {
+    public aItemDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int amount) {
         in = emIn;
         out = GT_OreDictUnificator.get(prefix, material, amount);
     }
 
     @Override
-    public iHasElementalDefinition input() {
+    public iElementalStack input() {
         return in.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
index 8f33f5096d..da9950a186 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -11,18 +11,18 @@ import net.minecraftforge.oredict.OreDictionary;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aItemQuantizationInfo implements iExchangeInfo<ItemStack,iHasElementalDefinition> {
-    private final ItemStack in;
-    private final boolean skipNBT;
-    private final iHasElementalDefinition out;
+public class aItemQuantizationInfo implements iExchangeInfo<ItemStack, iElementalStack> {
+    private final ItemStack       in;
+    private final boolean         skipNBT;
+    private final iElementalStack out;
 
-    public aItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, iHasElementalDefinition emOut) {
+    public aItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, iElementalStack emOut) {
         in = itemStackIn;
         out = emOut;
         this.skipNBT = skipNBT;
     }
 
-    public aItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, iHasElementalDefinition emOut) {
+    public aItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, iElementalStack emOut) {
         in = GT_OreDictUnificator.get(prefix, material, amount);
         out = emOut;
         this.skipNBT = skipNBT;
@@ -34,7 +34,7 @@ public class aItemQuantizationInfo implements iExchangeInfo<ItemStack,iHasElemen
     }
 
     @Override
-    public iHasElementalDefinition output() {
+    public iElementalStack output() {
         return out.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
index bbf94682b4..20f2252bd8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
@@ -1,37 +1,37 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aOredictDequantizationInfo implements iExchangeInfo<iHasElementalDefinition,String> {
-    private final iHasElementalDefinition in;
-    public final String out;
-    public final int amount;
+public class aOredictDequantizationInfo implements iExchangeInfo<iElementalStack,String> {
+    private final iElementalStack in;
+    public final  String          out;
+    public final  int             amount;
 
-    public aOredictDequantizationInfo(iHasElementalDefinition emIn, String name, int qty) {
+    public aOredictDequantizationInfo(iElementalStack emIn, String name, int qty) {
         in = emIn;
         out =name;
         amount = qty;
     }
 
-    public aOredictDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, Materials material, int qty) {
+    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int qty) {
         in = emIn;
         out = prefix.name() + material.mName;
         amount = qty;
     }
 
-    public aOredictDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, String materialName, int qty) {
+    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, String materialName, int qty) {
         in = emIn;
         out = prefix.name() + materialName;
         amount = qty;
     }
 
     @Override
-    public iHasElementalDefinition input() {
+    public iElementalStack input() {
         return in.clone();//MEH!
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
index 964d317b80..252b524185 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
@@ -1,30 +1,30 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class aOredictQuantizationInfo implements iExchangeInfo<String,iHasElementalDefinition> {
-    public final String in;
-    public final int amount;
-    private final iHasElementalDefinition out;
+public class aOredictQuantizationInfo implements iExchangeInfo<String, iElementalStack> {
+    public final  String          in;
+    public final  int             amount;
+    private final iElementalStack out;
 
-    public aOredictQuantizationInfo(String name, int qty, iHasElementalDefinition emOut){
+    public aOredictQuantizationInfo(String name, int qty, iElementalStack emOut){
         in=name;
         amount=qty;
         out=emOut;
     }
 
-    public aOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, iHasElementalDefinition emOut){
+    public aOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, iElementalStack emOut){
         in=prefix.name() + material.mName;
         amount=qty;
         out=emOut;
     }
 
-    public aOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, iHasElementalDefinition emOut){
+    public aOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, iElementalStack emOut){
         in=prefix.name() + materialName;
         amount=qty;
         out=emOut;
@@ -36,7 +36,7 @@ public class aOredictQuantizationInfo implements iExchangeInfo<String,iHasElemen
     }
 
     @Override
-    public iHasElementalDefinition output() {
+    public iElementalStack output() {
         return out.clone();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
index 69a4b9683c..39f946c54a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -69,14 +69,14 @@ public class bTransformationInfo {
         this.oredictDequantization = oredictDequantization;
     }
 
-    public void addFluid(iHasElementalDefinition em, FluidStack fluidStack){
+    public void addFluid(iElementalStack em, FluidStack fluidStack){
         fluidQuantization.put(fluidStack.getFluidID(),new aFluidQuantizationInfo(fluidStack,em));
         fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluidStack));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addFluid(iHasElementalDefinition em, Fluid fluid, int fluidAmount){
+    public void addFluid(iElementalStack em, Fluid fluid, int fluidAmount){
         fluidQuantization.put(fluid.getID(),new aFluidQuantizationInfo(fluid,fluidAmount,em));
         fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluid,fluidAmount));
         STACKS_REGISTERED.add(em.getDefinition());
@@ -87,35 +87,35 @@ public class bTransformationInfo {
         itemQuantization.put(aIQI,aIQI);
     }
 
-    public void addItem(iHasElementalDefinition em, ItemStack itemStack, boolean skipNBT){
+    public void addItem(iElementalStack em, ItemStack itemStack, boolean skipNBT){
         addItemQuantization(new aItemQuantizationInfo(itemStack,skipNBT,em));
         itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,itemStack));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addItem(iHasElementalDefinition em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
+    public void addItem(iElementalStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
         addItemQuantization(new aItemQuantizationInfo(prefix,material,amount,skipNBT,em));
         itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,prefix,material,amount));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addOredict(iHasElementalDefinition em, String name, int qty){
+    public void addOredict(iElementalStack em, String name, int qty){
         oredictQuantization.put(OreDictionary.getOreID(name),new aOredictQuantizationInfo(name,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,name,qty));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, Materials material, int qty){
+    public void addOredict(iElementalStack em, OrePrefixes prefix, Materials material, int qty){
         oredictQuantization.put(OreDictionary.getOreID(prefix.name() + material.mName),new aOredictQuantizationInfo(prefix,material,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,material,qty));
         STACKS_REGISTERED.add(em.getDefinition());
         STACKS_REGISTERED.add(em.getDefinition().getAnti());
     }
 
-    public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, String materialName, int qty){
+    public void addOredict(iElementalStack em, OrePrefixes prefix, String materialName, int qty){
         oredictQuantization.put(OreDictionary.getOreID(prefix.name() + materialName),new aOredictQuantizationInfo(prefix,materialName,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,materialName,qty));
         STACKS_REGISTERED.add(em.getDefinition());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
index e97d5994e9..291ec8fe6b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
@@ -3,9 +3,9 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -83,33 +83,23 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     private final boolean iaeaDefinitionExistsAndHasEnergyLevels;
 
-    private final cElementalDefinitionStackMap elementalStacks;
+    private final cElementalConstantStackMap elementalStacks;
 
     //stable is rawLifeTime>=10^9
 
-    @Deprecated
-    public dAtomDefinition(iElementalDefinition... things) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(things));
-    }
-
-    @Deprecated
-    private dAtomDefinition(boolean check, iElementalDefinition... things) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(things));
-    }
-
     public dAtomDefinition(cElementalDefinitionStack... things) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(things));
+        this(true, new cElementalConstantStackMap(things));
     }
 
     private dAtomDefinition(boolean check, cElementalDefinitionStack... things) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(things));
+        this(check, new cElementalConstantStackMap(things));
     }
 
-    public dAtomDefinition(cElementalDefinitionStackMap things) throws tElementalException {
+    public dAtomDefinition(cElementalConstantStackMap things) throws tElementalException {
         this(true, things);
     }
 
-    private dAtomDefinition(boolean check, cElementalDefinitionStackMap things) throws tElementalException {
+    private dAtomDefinition(boolean check, cElementalConstantStackMap things) throws tElementalException {
         if (check && !canTheyBeTogether(things)) {
             throw new tElementalException("Atom Definition error");
         }
@@ -121,7 +111,7 @@ public final class dAtomDefinition extends cElementalDefinition {
         int neutralCount = 0, element = 0;
         int type = 0;
         boolean containsAnti = false;
-        for (cElementalDefinitionStack stack : elementalStacks.values()) {
+        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
             iElementalDefinition def = stack.definition;
             int amount = (int)stack.amount;
             if((int)stack.amount!=stack.amount){
@@ -274,10 +264,10 @@ public final class dAtomDefinition extends cElementalDefinition {
         return rawLifeTime;
     }
 
-    private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
+    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
         boolean nuclei = false;
         long qty=0;
-        for (cElementalDefinitionStack stack : stacks.values()) {
+        for (cElementalDefinitionStack stack : stacks.valuesToArray()) {
             if (stack.definition instanceof dHadronDefinition) {
                 if (((dHadronDefinition) stack.definition).amount != 3) {
                     return false;
@@ -407,7 +397,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     @Override
-    public cElementalDefinitionStackMap getSubParticles() {
+    public cElementalConstantStackMap getSubParticles() {
         return elementalStacks.clone();
     }
 
@@ -484,33 +474,33 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean getDecayFromIaea(ArrayList<cElementalDecay> decaysList, iaeaNuclide.iaeaDecay decay, long energy){
-        cElementalMutableDefinitionStackMap withThis=elementalStacks.toMutable(),newStuff=new cElementalMutableDefinitionStackMap();
+        cElementalDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new cElementalDefinitionStackMap();
         switch (decay.decayName){
             case "D": {
                 if (withThis.removeAllAmounts(false, deuterium.definition.getSubParticles())){
                     withThis.putReplace(deuterium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "3H": {
                 if (withThis.removeAllAmounts(false, tritium.definition.getSubParticles())){
                     withThis.putReplace(tritium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "3HE": {
                 if (withThis.removeAllAmounts(false, helium_3.definition.getSubParticles())){
                     withThis.putReplace(helium_3);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
             case "8BE": {
                 if (withThis.removeAllAmounts(false, beryllium_8.definition.getSubParticles())){
                     withThis.putReplace(beryllium_8);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
             } break;
@@ -518,8 +508,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, carbon_14.definition.getSubParticles())){
                     newStuff.putReplace(carbon_14);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -532,8 +522,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, neon_24.definition.getSubParticles())){
                     newStuff.putReplace(neon_24);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -546,8 +536,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, silicon_34.definition.getSubParticles())){
                     newStuff.putReplace(silicon_34);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -560,8 +550,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2,dHadronDefinition.hadron_p2)){
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -576,8 +566,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -592,8 +582,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -608,8 +598,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -624,8 +614,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -639,8 +629,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     withThis.putUnify(dHadronDefinition.hadron_n1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -654,8 +644,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     withThis.putUnify(dHadronDefinition.hadron_n2);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -670,8 +660,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -686,8 +676,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -703,8 +693,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -720,8 +710,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -736,8 +726,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -753,8 +743,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_n1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -770,8 +760,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_n2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -786,8 +776,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -801,8 +791,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -817,8 +807,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -833,8 +823,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(dHadronDefinition.hadron_p2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -849,8 +839,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     newStuff.putReplace(dHadronDefinition.hadron_p3);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -863,8 +853,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
                     newStuff.putReplace(dHadronDefinition.hadron_n1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -877,8 +867,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
                     newStuff.putReplace(dHadronDefinition.hadron_n2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -891,8 +881,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){
                     newStuff.putReplace(dHadronDefinition.hadron_p1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -905,8 +895,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                 if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
                     newStuff.putReplace(dHadronDefinition.hadron_p2);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -1001,8 +991,8 @@ public final class dAtomDefinition extends cElementalDefinition {
                     newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
                     newStuff.putReplace(eBosonDefinition.boson_Y__1);
                     try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafeLeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
                     }catch (Exception e){
                         if(DEBUG_MODE) {
@@ -1023,10 +1013,10 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean Emmision(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStack emit) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAmount(false, emit)) {
             try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), emit));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), emit));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1038,10 +1028,10 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean alphaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAllAmounts(false, alpha.definition.getSubParticles())) {
             try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), alpha));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), alpha));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1053,11 +1043,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean MbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAmount(false, dHadronDefinition.hadron_n1)) {
             try {
                 tree.putUnify(dHadronDefinition.hadron_p1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e1, eNeutrinoDefinition.lepton_Ve_1));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e1, eNeutrinoDefinition.lepton_Ve_1));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1069,11 +1059,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean PbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAmount(false, dHadronDefinition.hadron_p1)) {
             try {
                 tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e_1, eNeutrinoDefinition.lepton_Ve1));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e_1, eNeutrinoDefinition.lepton_Ve1));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1085,11 +1075,11 @@ public final class dAtomDefinition extends cElementalDefinition {
     }
 
     private boolean ElectronCapture(ArrayList<cElementalDecay> decaysList) {
-        cElementalMutableDefinitionStackMap tree = elementalStacks.toMutable();
+        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
         if (tree.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)) {
             try {
                 tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafeLeavesExposedElementalTree()), 1), eNeutrinoDefinition.lepton_Ve1));
+                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eNeutrinoDefinition.lepton_Ve1));
                 return true;
             } catch (Exception e) {
                 if (DEBUG_MODE) {
@@ -1100,11 +1090,11 @@ public final class dAtomDefinition extends cElementalDefinition {
         return false;
     }
 
-    private boolean Fission(ArrayList<cElementalDecay> decaysList, cElementalMutableDefinitionStackMap fissile, cElementalMutableDefinitionStackMap particles,double probability,boolean spontaneousCheck) {
-        cElementalMutableDefinitionStackMap heavy = new cElementalMutableDefinitionStackMap();
-        double[] liquidDrop= liquidDropFunction(Math.abs(element)<=97);
+    private boolean Fission(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStackMap fissile, cElementalDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
+        cElementalDefinitionStackMap heavy      = new cElementalDefinitionStackMap();
+        double[]                     liquidDrop = liquidDropFunction(Math.abs(element)<=97);
 
-        for(cElementalDefinitionStack stack: fissile.values()){
+        for(cElementalDefinitionStack stack: fissile.valuesToArray()){
             if(spontaneousCheck && stack.definition instanceof dHadronDefinition &&
                     (stack.amount<=80 || stack.amount<90 && XSTR_INSTANCE.nextInt(10)<stack.amount-80)) {
                 return false;
@@ -1138,9 +1128,9 @@ public final class dAtomDefinition extends cElementalDefinition {
         }
 
         try {
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_optimized_unsafeLeavesExposedElementalTree()),1));
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_optimized_unsafeLeavesExposedElementalTree()),1));
-            decaysList.add(new cElementalDecay(probability, particles.toImmutable_optimized_unsafeLeavesExposedElementalTree()));
+            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            decaysList.add(new cElementalDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
             return true;
         } catch (Exception e) {
             if(DEBUG_MODE) {
@@ -1273,7 +1263,7 @@ public final class dAtomDefinition extends cElementalDefinition {
     public cElementalDecay[] getNaturalDecayInstant() {
         //disembody
         ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<>();
-        for (cElementalDefinitionStack elementalStack : elementalStacks.values()) {
+        for (cElementalDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
             if (elementalStack.definition.getType() == 1 || elementalStack.definition.getType() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(elementalStack);
@@ -1302,12 +1292,12 @@ public final class dAtomDefinition extends cElementalDefinition {
 
     @Override
     public dAtomDefinition getAnti() {
-        cElementalMutableDefinitionStackMap anti = new cElementalMutableDefinitionStackMap();
-        for (cElementalDefinitionStack stack : elementalStacks.values()) {
+        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
+        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
             anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
         }
         try {
-            return new dAtomDefinition(anti.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+            return new dAtomDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
         } catch (tElementalException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
index 4ea5eb3776..aa0951d98c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
@@ -58,31 +58,21 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     //private final FluidStack fluidThing;
     //private final ItemStack itemThing;
 
-    private final cElementalDefinitionStackMap quarkStacks;
-
-    @Deprecated
-    public dHadronDefinition(eQuarkDefinition... quarks) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(quarks));
-    }
-
-    @Deprecated
-    private dHadronDefinition(boolean check, eQuarkDefinition... quarks) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(quarks));
-    }
+    private final cElementalConstantStackMap quarkStacks;
 
     public dHadronDefinition(cElementalDefinitionStack... quarks) throws tElementalException {
-        this(true, new cElementalDefinitionStackMap(quarks));
+        this(true, new cElementalConstantStackMap(quarks));
     }
 
     private dHadronDefinition(boolean check, cElementalDefinitionStack... quarks) throws tElementalException {
-        this(check, new cElementalDefinitionStackMap(quarks));
+        this(check, new cElementalConstantStackMap(quarks));
     }
 
-    public dHadronDefinition(cElementalDefinitionStackMap quarks) throws tElementalException {
+    public dHadronDefinition(cElementalConstantStackMap quarks) throws tElementalException {
         this(true, quarks);
     }
 
-    private dHadronDefinition(boolean check, cElementalDefinitionStackMap quarks) throws tElementalException {
+    private dHadronDefinition(boolean check, cElementalConstantStackMap quarks) throws tElementalException {
         if (check && !canTheyBeTogether(quarks)) {
             throw new tElementalException("Hadron Definition error");
         }
@@ -93,7 +83,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
         int type = 0;
         boolean containsAnti = false;
         double mass = 0;
-        for (cElementalDefinitionStack quarkStack : quarkStacks.values()) {
+        for (cElementalDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
             amount += quarkStack.amount;
             if((int)quarkStack.amount!=quarkStack.amount){
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
@@ -131,9 +121,9 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     }
 
     //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalDefinitionStackMap stacks) {
+    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
         long amount = 0;
-        for (cElementalDefinitionStack quarks : stacks.values()) {
+        for (cElementalDefinitionStack quarks : stacks.valuesToArray()) {
             if (!(quarks.definition instanceof eQuarkDefinition)) {
                 return false;
             }
@@ -153,7 +143,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
         if(sym!=null){
             name.append(' ').append(sym);
         }else {
-            for (cElementalDefinitionStack quark : quarkStacks.values()) {
+            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
                 name.append(' ').append(quark.definition.getSymbol()).append((int)quark.amount);
             }
         }
@@ -184,7 +174,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
             return sym;
         }else {
             StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.values()) {
+            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.amount; i++) {
                     symbol.append(quark.definition.getSymbol());
                 }
@@ -200,7 +190,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
             return sym;
         }else {
             StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.values()) {
+            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.amount; i++) {
                     symbol.append(quark.definition.getShortSymbol());
                 }
@@ -215,13 +205,13 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
     }
 
     @Override
-    public cElementalDefinitionStackMap getSubParticles() {
+    public cElementalConstantStackMap getSubParticles() {
         return quarkStacks;
     }
 
     @Override
     public cElementalDecay[] getNaturalDecayInstant() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
+        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
             return cElementalDecay.noProduct;
         }
@@ -243,7 +233,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     @Override
     public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
+        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
             return cElementalDecay.noProduct;
         }
@@ -277,7 +267,7 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     @Override
     public cElementalDecay[] getDecayArray() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.values();
+        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (amount == 2 && quarkStacks.length == 2 &&
                 quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() &&
                 quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
@@ -297,15 +287,17 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
             cElementalDefinitionStack[] decay;
             if (Math.abs(lastQuark.getType()) > 1) {
-                decay = lastQuark.getDecayArray()[1].outputStacks.values();
+                decay = lastQuark.getDecayArray()[1].outputStacks.valuesToArray();
             } else {
-                decay = lastQuark.getDecayArray()[2].outputStacks.values();
+                decay = lastQuark.getDecayArray()[2].outputStacks.valuesToArray();
             }
             newBaryon.add((eQuarkDefinition) decay[0].definition);
             Particles[0] = decay[1].definition;
             Particles[1] = decay[2].definition;
 
-            eQuarkDefinition[] contentOfBaryon = newBaryon.toArray(new eQuarkDefinition[3]);
+            cElementalDefinitionStack[] contentOfBaryon = newBaryon.stream()
+                    .map(eQuarkDefinition -> new cElementalDefinitionStack(eQuarkDefinition,1))
+                    .toArray(cElementalDefinitionStack[]::new);
 
             try {
                 return new cElementalDecay[]{
@@ -363,12 +355,12 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     @Override
     public iElementalDefinition getAnti() {
-        cElementalMutableDefinitionStackMap anti = new cElementalMutableDefinitionStackMap();
-        for (cElementalDefinitionStack stack : quarkStacks.values()) {
+        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
+        for (cElementalDefinitionStack stack : quarkStacks.valuesToArray()) {
             anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
         }
         try {
-            return new dHadronDefinition(anti.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+            return new dHadronDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
         } catch (tElementalException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -414,10 +406,10 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
 
     public static void run() {
         try {
-            hadron_p = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
+            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
             protonMass = hadron_p.mass;
             //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
-            hadron_p = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
+            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
             SYMBOL_MAP.put(hadron_p,"p");
             NAME_MAP.put(hadron_p,"Proton");
             DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
@@ -425,10 +417,10 @@ public final class dHadronDefinition extends cElementalDefinition {//TODO Optimi
             SYMBOL_MAP.put(hadron_p_,"~p");
             NAME_MAP.put(hadron_p_,"Anti Proton");
             DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
-            hadron_n = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
+            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.mass;
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
-            hadron_n = new dHadronDefinition(new cElementalDefinitionStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
+            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
             NAME_MAP.put(hadron_n, "Neutron");
             DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
index a3efe12b7e..8096743b78 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.noDecay;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
 
 /**
  * Created by danie_000 on 22.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
index 9a82cdd6c0..e87df806d3 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
@@ -1,10 +1,10 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition.*;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
index 1e3b7189a8..c8e3b07f02 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
index c55e7f6364..0f0725d208 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
index 9e5b2e66bb..798066466b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index b0b349a268..05f251924e 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.recipe;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -17,16 +17,16 @@ import java.util.HashSet;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 
 public class TT_recipe extends GT_Recipe {
-    public static final String E_RECIPE_ID = "eRecipeID";
-    public final cElementalDefinitionStackMap[] input;
-    public final cElementalDefinitionStackMap[] output;
-    public final cElementalDefinitionStackMap[] eCatalyst;
-    public final IAdditionalCheck additionalCheck;
+    public static final String                E_RECIPE_ID = "eRecipeID";
+    public final cElementalConstantStackMap[] input;
+    public final cElementalConstantStackMap[] output;
+    public final cElementalConstantStackMap[] eCatalyst;
+    public final IAdditionalCheck             additionalCheck;
 
     public TT_recipe(boolean aOptimize,
                      ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
                      FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue,
-                     cElementalDefinitionStackMap[] in, cElementalDefinitionStackMap[] out, cElementalDefinitionStackMap[] catalyst, IAdditionalCheck check){
+                     cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check){
         super(aOptimize,aInputs,aOutputs,aSpecialItems,aChances,aFluidInputs,aFluidOutputs,aDuration,aEUt,aSpecialValue);
         input=in;
         output=out;
@@ -110,7 +110,7 @@ public class TT_recipe extends GT_Recipe {
         }
         if (input != null) {
             if (in != null) {
-                for (cElementalDefinitionStackMap anInput : input) {
+                for (cElementalConstantStackMap anInput : input) {
                     if (anInput != null && anInput.hasStacks()) {
                         if (in.hasStacks()) {
                             if (!in.removeAllAmounts(consume, anInput)) {
@@ -181,7 +181,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in, cElementalDefinitionStackMap[] out, cElementalDefinitionStackMap[] catalyst, IAdditionalCheck check) {
+                                cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchItem=researchItem;
         }
@@ -189,7 +189,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in) {
+                                cElementalConstantStackMap[] in) {
             this(aOptimize, researchItem, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
@@ -199,9 +199,9 @@ public class TT_recipe extends GT_Recipe {
         public final GT_Recipe scannerRecipe;
 
         public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
-                                ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
-                                FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in, cElementalDefinitionStackMap[] out, cElementalDefinitionStackMap[] catalyst, IAdditionalCheck check) {
+                           ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
+                           FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
+                           cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchEM=researchEM;
             this.scannerRecipe=scannerRecipe;
@@ -210,7 +210,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalDefinitionStackMap[] in) {
+                                cElementalConstantStackMap[] in) {
             this(aOptimize, scannerRecipe, researchEM, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index 71a5419500..ffa69ef78e 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.recipe;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
@@ -150,7 +150,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMmachineRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalDefinitionStackMap[] eInputs,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -184,7 +184,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMcrafterRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalDefinitionStackMap[] eInputs, cElementalDefinitionStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchItem==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -207,7 +207,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addScannableEMmachineRecipe(
             iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalDefinitionStackMap[] eInputs,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -234,7 +234,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalDefinitionStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_machine.machine)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,aInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 aFluidInputs,machineDuration,machineEUt,machineAmperage,eInputs));
@@ -243,7 +243,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addScannableEMcrafterRecipe(
             iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalDefinitionStackMap[] eInputs, cElementalDefinitionStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchEM==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -259,7 +259,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalDefinitionStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_crafting.crafter)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,null,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 null,crafterDuration,crafterEUt,crafterAmperage,eInputs,null,catalyst,check));
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index bfd7d266c0..b1f6d8887b 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalInstanceContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
@@ -58,8 +58,8 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
             aStack.stackSize = 1;
             if (tTileEntity instanceof IGregTechTileEntity) {
                 IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-                if (metaTE instanceof iElementalInstanceContainer) {
-                    cElementalInstanceStackMap content = ((iElementalInstanceContainer) metaTE).getContainerHandler();
+                if (metaTE instanceof iElementalContainer) {
+                    cElementalInstanceStackMap content = ((iElementalContainer) metaTE).getContentHandler();
                     if (tNBT.hasKey("content")) {
                         try {
                             content.putUnifyAll(cElementalInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
@@ -69,12 +69,12 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
                             }
                             return true;
                         }
-                        ((iElementalInstanceContainer) metaTE).purgeOverflow();
+                        ((iElementalContainer) metaTE).purgeOverflow();
                         tNBT.removeTag("content");
                         tNBT.removeTag("symbols");
                         tNBT.removeTag("info");
                     } else if (content.hasStacks()) {
-                        ((iElementalInstanceContainer) metaTE).purgeOverflow();
+                        ((iElementalContainer) metaTE).purgeOverflow();
                         tNBT.setTag("info", content.getInfoNBT());
                         tNBT.setTag("content", content.toNBT());
                         tNBT.setTag("symbols", content.getShortSymbolsNBT());
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index fa1c25cbf5..2513bdf8bf 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -38,17 +38,17 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
     }
 
     //return previous thing
-    public static cElementalDefinitionStackMap setContent(ItemStack containerItem, cElementalDefinitionStackMap definitions){
+    public static cElementalConstantStackMap setContent(ItemStack containerItem, cElementalConstantStackMap definitions){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM) {
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 tNBT = containerItem.stackTagCompound = new NBTTagCompound();
             }
 
-            cElementalDefinitionStackMap oldMap=null;
+            cElementalConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap=cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
                 } catch (tElementalException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
@@ -63,7 +63,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalDefinitionStackMap getContent(ItemStack containerItem){
+    public static cElementalConstantStackMap getContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
 
@@ -71,7 +71,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 return null;
             }
             try {
-                return cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                return cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
             } catch (tElementalException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
@@ -81,17 +81,17 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalDefinitionStackMap clearContent(ItemStack containerItem){
+    public static cElementalConstantStackMap clearContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 return null;
             }
 
-            cElementalDefinitionStackMap oldMap=null;
+            cElementalConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap=cElementalDefinitionStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
                 } catch (tElementalException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index c951229c92..e43feb2351 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index c8606f68f0..d25a0c62ed 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalInstanceContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToElementalPipe;
 import com.github.technus.tectech.util.Util;
@@ -34,7 +34,7 @@ import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 /**
  * Created by danie_000 on 11.12.2016.
  */
-public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements iElementalInstanceContainer, IConnectsToElementalPipe {
+public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements iElementalContainer, IConnectsToElementalPipe {
     private static Textures.BlockIcons.CustomIcon EM_T_SIDES;
     private static Textures.BlockIcons.CustomIcon EM_T_ACTIVE;
     private static Textures.BlockIcons.CustomIcon EM_T_CONN;
@@ -165,7 +165,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     @Override
-    public cElementalInstanceStackMap getContainerHandler() {
+    public cElementalInstanceStackMap getContentHandler() {
         return content;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
index a1e4f5a8a5..1426e8a702 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
@@ -62,7 +62,7 @@ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_H
                 if (aMetaTileEntity != null) {
                     if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputElemental &&
                             opposite == tGTTileEntity.getFrontFacing()) {
-                        ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).getContainerHandler().putUnifyAll(content);
+                        ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).getContentHandler().putUnifyAll(content);
                         ((GT_MetaTileEntity_Hatch_InputElemental) aMetaTileEntity).updateSlots();
                         content.clear();
                         return;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index 49c43d6b4e..a61bf27fe3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -3,14 +3,17 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalMutableDefinitionStackMap;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
+import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
+import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
@@ -20,9 +23,6 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
-import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -39,13 +39,12 @@ import java.util.HashMap;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.DoubleCount.add;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -86,10 +85,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnifyAll(in2.definition.getSubParticles());
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -115,10 +114,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnifyAll(in2.definition.getSubParticles());
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -140,10 +139,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnify(in2.definition.getStackForm(1));
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -184,10 +183,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
         PRIMITIVE_FUSE_HANDLERS.put(eQuarkDefinition.class.getName() + '\0' + eQuarkDefinition.class.getName(), (in1, in2, out) -> {
             try {
-                cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                 defs.putUnify(in1.definition.getStackForm(1));
                 defs.putUnify(in2.definition.getStackForm(1));
-                dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                 out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
             } catch (Exception e) {
                 out.putUnifyAll(in1, in2);
@@ -211,10 +210,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     private static boolean fuseAspects(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
         try {
-            cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+            cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
             defs.putUnify(in1.definition.getStackForm(1));
             defs.putUnify(in2.definition.getStackForm(1));
-            dComplexAspectDefinition aspect = new dComplexAspectDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+            dComplexAspectDefinition aspect = new dComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
             out.putUnify(new cElementalInstanceStack(aspect, Math.min(in1.amount, in2.amount)));
         } catch (Exception e) {
             out.putUnifyAll(in1, in2);
@@ -247,10 +246,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             @Override
             public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
                 try {
-                    cElementalMutableDefinitionStackMap defs = new cElementalMutableDefinitionStackMap();
+                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
                     defs.putUnifyAll(in1.definition.getSubParticles());
                     defs.putUnify(in2.definition.getStackForm(1));
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafeLeavesExposedElementalTree());
+                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
                     out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
@@ -303,6 +302,49 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     //region structure
     //use multi A energy inputs, use less power the longer it runs
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = StructureDefinition
+            .<GT_MetaTileEntity_EM_collider>builder()
+            .addShapeOldApi("main", new String[][]{
+                    {"I0A0A0", "I00000", "I0A0A0",},
+                    {"H0000000", "G001111100", "H0000000",},
+                    {"F22223332222", "F41155555114", "F22223332222",},
+                    {"E2000000000002", "E4155111115514", "E2000000000002",},
+                    {"D20000E00002", "D41511E11514", "D20000E00002",},
+                    {"C2000I0002", "C4151I1514", "C2000I0002",},
+                    {"B2000K0002", "B4151K1514", "B2000K0002",},
+                    {"B200M002", "A0151M1510", "B200M002",},
+                    {"A0200M0020", "A0151M1510", "A0200M0020",},
+                    {"0020O0200", "0151O1510", "0020O0200",},
+                    {"A030O030", "0151O1510", "A030O030",},
+                    {"0030O0300", "0151O1510", "0030O0300",},
+                    {"A030O030", "0151O1510", "A030O030",},
+                    {"0020O0200", "0151O1510", "0020O0200",},
+                    {"A0200M0020", "A0151M1510", "A0200M0020",},
+                    {"B200M002", "A0151M1510", "B200M002",},
+                    {"B2000K0002", "B4151K1514", "B2000K0002",},
+                    {"C2000I0002", "C4151I1514", "C2000I0002",},
+                    {"D200002&&&200002", "D415112&.&211514", "D200002&&&200002",},
+                    {"E20!!22222!!02", "E4155111115514", "E20!!22222!!02",},
+                    {"F2222#$#2222", "F41155555114", "F2222#$#2222",},
+            })
+            .addElement('0', ofBlock(sBlockCasingsTT, 4))
+            .addElement('1', ofBlock(sBlockCasingsTT, 7))
+            .addElement('2', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 5)))
+            .addElement('3', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('4', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 6)))
+            .addElement('5', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 8), ofBlock(sBlockCasingsTT, 9)))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addClassicToMachineList,
+                    textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList,
+                    textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList,
+                    textureOffset + 4, 3, sBlockCasingsTT, 4))
+            .addElement('#', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList,
+                    textureOffset + 4, 4, sBlockCasingsTT, 4))
+            .build();
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -312,27 +354,8 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_collider>builder()
-            .addShape("main", transpose(new String[][]{
-                    {"         A A A         ","        AAAAAAA        ","      BBBBIIIBBBB      ","     BAAAAAAAAAAAB     ","    BAAAA     AAAAB    ","   BAAA         AAAB   ","  BAAA           AAAB  ","  BAA             AAB  "," ABAA             AABA ","AABA               ABAA"," AIA               AIA ","AAIA               AIAA"," AIA               AIA ","AABA               ABAA"," ABAA             AABA ","  BAA             AAB  ","  BAAA           AAAB  ","   BAAA         AAAB   ","    BAAAABJJJBAAAAB    ","     BAHHBBBBBHHAB     ","      BBBBGFGBBBB      "},
-                    {"         AAAAA         ","       AADDDDDAA       ","      CDDEEEEEDDC      ","     CDEEDDDDDEEDC     ","    CDEDD     DDEDC    ","   CDED         DEDC   ","  CDED           DEDC  "," ADED             DEDA "," ADED             DEDA ","ADED               DEDA","ADED               DEDA","ADED               DEDA","ADED               DEDA","ADED               DEDA"," ADED             DEDA "," ADED             DEDA ","  CDED           DEDC  ","   CDED         DEDC   ","    CDEDDBJ~JBDDEDC    ","     CDEEDDDDDEEDC     ","      CDDEEEEEDDC      "},
-                    {"         A A A         ","        AAAAAAA        ","      BBBBIIIBBBB      ","     BAAAAAAAAAAAB     ","    BAAAA     AAAAB    ","   BAAA         AAAB   ","  BAAA           AAAB  ","  BAA             AAB  "," ABAA             AABA ","AABA               ABAA"," AIA               AIA ","AAIA               AIAA"," AIA               AIA ","AABA               ABAA"," ABAA             AABA ","  BAA             AAB  ","  BAAA           AAAB  ","   BAAA         AAAB   ","    BAAAABJJJBAAAAB    ","     BAHHBBBBBHHAB     ","      BBBBGFGBBBB      "}
-            }))
-            .addElement('A', ofBlock(sBlockCasingsTT, 4))
-            .addElement('B', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1), error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 5)))
-            .addElement('C', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1), error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 6)))
-            .addElement('D', ofBlock(sBlockCasingsTT, 7))
-            .addElement('E', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1), error(), ofBlock(sBlockCasingsTT, 8), ofBlock(sBlockCasingsTT, 9)))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('G', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList, textureOffset + 4, 4, sBlockCasingsTT, 4))
-            .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
-            .addElement('I', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('J', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .build();
-
     @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_collider> getStructure_EM() {
+    public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -371,7 +394,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 colliderHandler = FUSE_HANDLERS.get((stack.definition.getClassType() << 16) | stack2.definition.getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             }
-            for (cElementalInstanceStack newStack : map.values()) {
+            for (cElementalInstanceStack newStack : map.valuesToArray()) {
                 check &= newStack.definition.fusionMakesEnergy(newStack.getEnergy());
             }
             //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
@@ -502,7 +525,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         if (started) {
             if (stack == null) {
                 for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
-                    cElementalInstanceStackMap container = inputElemental.getContainerHandler();
+                    cElementalInstanceStackMap container = inputElemental.getContentHandler();
                     if (container.isEmpty()) {
                         continue;
                     }
@@ -567,7 +590,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             if (outputEM != null) {
                 for (int i = 0, lim = Math.min(outputEM.length, eOutputHatches.size()); i < lim; i++) {
                     if (outputEM[i] != null) {
-                        eOutputHatches.get(i).getContainerHandler().putUnifyAll(outputEM[i]);
+                        eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
                         outputEM[i] = null;
                     }
                 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index 97b4a7786e..ed245b0e97 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -1,7 +1,10 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
+import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
@@ -10,9 +13,6 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
-import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -21,9 +21,9 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtech.api.util.GT_Utility;
 import ic2.core.init.MainConfig;
 import ic2.core.util.ConfigUtil;
+import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -32,15 +32,13 @@ import net.minecraft.util.EnumChatFormatting;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW;
 import static com.github.technus.tectech.util.CommonValues.VN;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
@@ -60,28 +58,30 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     //endregion
 
     //region structure
+    private static final String[][] shape = new String[][]{
+            {"0C0", "A   ", "A . ", "A   ", "0C0",},
+            {"00000", "00000", "00000", "00000", "00000",},
+            {"0C0", "A!!!", "A!0!", "A!!!", "0C0",},
+            {"01110", "12221", "12221", "12221", "01110",},
+            {"01310", "12221", "32223", "12221", "01310",},
+            {"01110", "12221", "12221", "12221", "01110",},
+            {"0C0", "A!!!", "A!0!", "A!!!", "0C0",},
+            {"00000", "00000", "00000", "00000", "00000",},
+            {"0C0", "A   ", "A   ", "A   ", "0C0",},
+    };
+    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMeta = new byte[]{4, 5, 8, 6};
+    private static final IHatchAdder<GT_MetaTileEntity_EM_decay>[] addingMethods = adders(
+            GT_MetaTileEntity_EM_decay::addClassicToMachineList,
+            GT_MetaTileEntity_EM_decay::addElementalToMachineList);
+    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMetaFallback = new byte[]{0, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.decay.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.decay.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
-
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_decay> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_decay>builder()
-            .addShape("main",transpose(new String[][]{
-                    {"A   A","AAAAA","A   A","ABBBA","ABCBA","ABBBA","A   A","AAAAA","A   A"},
-                    {" FFF ","AAAAA"," EEE ","BDDDB","BDDDB","BDDDB"," EEE ","AAAAA"," FFF "},
-                    {" F~F ","AAAAA"," EAE ","BDDDB","CDDDC","BDDDB"," EAE ","AAAAA"," FFF "},
-                    {" FFF ","AAAAA"," EEE ","BDDDB","BDDDB","BDDDB"," EEE ","AAAAA"," FFF "},
-                    {"A   A","AAAAA","A   A","ABBBA","ABCBA","ABBBA","A   A","AAAAA","A   A"}
-            }))
-            .addElement('A', ofBlock(sBlockCasingsTT, 4))
-            .addElement('B', ofBlock(sBlockCasingsTT, 5))
-            .addElement('C', ofBlock(sBlockCasingsTT, 6))
-            .addElement('D', ofBlock(sBlockCasingsTT, 8))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_decay::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_decay::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .build();
     //endregion
 
     //region parameters
@@ -110,7 +110,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM("main", 2, 2, 0);
+        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0);
     }
 
     @Override
@@ -118,7 +118,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
         cElementalInstanceStackMap map = getInputsClone_EM();
         if (map != null && map.hasStacks()) {
             for (GT_MetaTileEntity_Hatch_InputElemental i : eInputHatches) {
-                i.getContainerHandler().clear();
+                i.getContentHandler().clear();
             }
             return startRecipe(map);
         }
@@ -132,7 +132,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
         outputEM[0] = input;
         outputEM[1] = new cElementalInstanceStackMap();
 
-        for (cElementalInstanceStack stack : outputEM[0].values()) {
+        for (cElementalInstanceStack stack : outputEM[0].valuesToArray()) {
             if (stack.getEnergy() == 0 && stack.definition.decayMakesEnergy(1) &&
                     getBaseMetaTileEntity().decreaseStoredEnergyUnits(
                             (long) (stack.getEnergySettingCost(1) * URANIUM_MASS_TO_EU_INSTANT), false)) {
@@ -156,7 +156,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     @Override
     public void outputAfterRecipe_EM() {
         for (int i = 0; i < 2 && i < eOutputHatches.size(); i++) {
-            eOutputHatches.get(i).getContainerHandler().putUnifyAll(outputEM[i]);
+            eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
             outputEM[i] = null;
         }
     }
@@ -189,30 +189,21 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
         return new String[]{
                 translateToLocalFormatted("tt.keyword.Progress", clientLocale) + ":",
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s",
+                EnumChatFormatting.GREEN + Integer.toString(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " +
+                        EnumChatFormatting.YELLOW + mMaxProgresstime / 20 + EnumChatFormatting.RESET + " s",
                 translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":",
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU",
+                EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
+                        EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU",
                 (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") +
-                        EnumChatFormatting.RED + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t at " +
-                        EnumChatFormatting.RED + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A",
-                translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " +
-                        EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + " " +
-                        translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " +
-                        EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET + " A",
-                translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " +
-                        EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " " +
-                        translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " +
-                        EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
-                translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " +
-                        EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + " " +
-                        translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " +
-                        EnumChatFormatting.BLUE + eSafeVoid,
-                translateToLocalFormatted("tt.keyword.Computation", clientLocale) + ": " +
-                        EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eAvailableData) + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET,
+                        EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t at " +
+                        EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A",
+                translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
+                        " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
+                translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
+                        " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
+                translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
+                        " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid,
+                translateToLocalFormatted("tt.keyword.Computation", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET,
         };
     }
 
@@ -257,12 +248,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        structureBuild_EM("main", 2, 2, 0, hintsOnly, stackSize);
-    }
-
-    @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_decay> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
+        Structure.builder(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index f0dca07f9c..208219cd59 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -1,22 +1,23 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
-import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
@@ -28,14 +29,10 @@ import java.util.ArrayList;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass;
+import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
-import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sHintCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -44,22 +41,21 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_dequantizer> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_dequantizer>builder()
-            .addShape("main", transpose(new String[][]{
-                    {"CCC","ABA","EEE","BDB"},
-                    {"C~C","BBB","EBE","DFD"},
-                    {"CCC","ABA","EEE","BDB"}
-            }))
-            .addElement('A', ofBlock(sBlockCasingsTT, 0))
-            .addElement('B', ofBlock(sBlockCasingsTT, 4))
-            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList, textureOffset + 4, sHintCasingsTT, 1))
-            .build();
-
+    private static final String[][] shape = new String[][]{
+            {"   ", " . ", "   ",},
+            {"010", "111", "010",},
+            {"\"\"\"", "\"1\"", "\"\"\"",},
+            {"121", "2!2", "121",},
+    };
+    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, QuantumGlassBlock.INSTANCE};
+    private static final byte[] blockMeta = new byte[]{0, 4, 0};
+    private static final IHatchAdder<GT_MetaTileEntity_EM_dequantizer>[] addingMethods = adders(
+            GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList,
+            GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList,
+            GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList);
+    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.0"),//1 - Classic Hatches or High Power Casing"
@@ -76,7 +72,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         super(aName);
     }
 
-    private void startRecipe(iHasElementalDefinition from, long energy) {
+    private void startRecipe(iElementalStack from, long energy) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = from.getMass();
@@ -96,14 +92,14 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM("main", 1, 1, 0);
+        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
     }
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-            cElementalInstanceStackMap map = in.getContainerHandler();
-            for (cElementalInstanceStack stack : map.values()) {
+            cElementalInstanceStackMap map = in.getContentHandler();
+            for (cElementalInstanceStack stack : map.valuesToArray()) {
                 {
                     aFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
                     if (info != null) {
@@ -159,12 +155,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        structureBuild_EM("main", 1, 1, 0, hintsOnly, stackSize);
-    }
-
-    @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_dequantizer> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
+        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index 7d0ee03320..451443fa8a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-            if (in.getContainerHandler().hasStacks()) {
+            if (in.getContentHandler().hasStacks()) {
                 mEUt = -(int) V[8];
                 eAmpereFlow = 1 + (eInputHatches.size() + eOutputHatches.size() >> 1);
                 mMaxProgresstime = 20;
@@ -148,8 +148,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                     continue;
                 }
                 GT_MetaTileEntity_Hatch_OutputElemental out = eOutputHatches.get(outIndex);
-                out.getContainerHandler().putUnifyAll(in.getContainerHandler());
-                in.getContainerHandler().clear();
+                out.getContentHandler().putUnifyAll(in.getContentHandler());
+                in.getContentHandler().clear();
             }
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index c3e35ba90c..f5504eadc7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -3,9 +3,9 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iHasElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictQuantizationInfo;
@@ -113,7 +113,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (aOQI == null) {
                                 continue;
                             }
-                            iHasElementalDefinition into = aOQI.output();
+                            iElementalStack into = aOQI.output();
                             if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.amount, is.getItemDamage())}, null, inI)) {
                                 startRecipe(into);
                                 return true;
@@ -124,7 +124,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                         if (DEBUG_MODE) {
                             TecTech.LOGGER.info("Quantifier-Item-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage());
                         }
-                        iHasElementalDefinition into = aIQI.output();
+                        iElementalStack into = aIQI.output();
                         if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aIQI.input().stackSize, is.getItemDamage())}, null, inI)) {
                             startRecipe(into);
                             return true;
@@ -140,7 +140,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                     if (aFQI == null) {
                         continue;
                     }
-                    iHasElementalDefinition into = aFQI.output();
+                    iElementalStack into = aFQI.output();
                     if (into != null && fs.amount >= aFQI.input().amount && isInputEqual(true, false,
                             new FluidStack[]{aFQI.input()}, nullItem, inF, (ItemStack[]) null)) {
                         startRecipe(into);
@@ -152,7 +152,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         return false;
     }
 
-    private void startRecipe(iHasElementalDefinition into) {
+    private void startRecipe(iElementalStack into) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = into.getMass();
@@ -176,7 +176,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             stopMachine();
             return;
         }
-        eOutputHatches.get(0).getContainerHandler().putUnifyAll(outputEM[0]);
+        eOutputHatches.get(0).getContentHandler().putUnifyAll(outputEM[0]);
         outputEM = null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 8c545b50c5..d02088e805 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -1,10 +1,13 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
+import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.recipe.TT_recipe;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -13,9 +16,6 @@ import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.util.CommonValues;
-import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -23,7 +23,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
@@ -37,6 +36,7 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipe.E_RECIPE_ID;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -45,10 +45,6 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.G
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.CommonValues.VN;
 import static com.github.technus.tectech.util.Util.areBitsSet;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
@@ -73,6 +69,26 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     //endregion
 
     //region structure
+    private static final String[][] shape = new String[][]{
+            {"     ", " 222 ", " 2.2 ", " 222 ", "     ",},
+            {"00000", "00000", "00000", "00000", "00000",},
+            {"00100", "01110", "11111", "01110", "00100",},
+            {"01110", "1---1", "1---1", "1---1", "01110",},
+            {"01110", "1---1", "1-A-1", "1---1", "01110",},
+            {"01110", "1---1", "1---1", "1---1", "01110",},
+            {"00100", "01110", "11\"11", "01110", "00100",},
+            {"#####", "#000#", "#0!0#", "#000#", "#####",},
+    };
+    private static final Block[] blockType = new Block[]{sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT};
+    private static final byte[] blockMeta = new byte[]{4, 0, 0};
+    private static final IHatchAdder<GT_MetaTileEntity_EM_scanner>[] addingMethods = adders(
+            GT_MetaTileEntity_EM_scanner::addClassicToMachineList,
+            GT_MetaTileEntity_EM_scanner::addElementalInputToMachineList,
+            GT_MetaTileEntity_EM_scanner::addElementalOutputToMachineList,
+            GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList);
+    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4, textureOffset + 4};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -80,24 +96,6 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.2"),//3 - Elemental Output Hatches or Molecular Casing
             translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing
     };
-
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_scanner> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_scanner>builder()
-            .addShape("main", transpose(new String[][]{
-                    {"CCCCC","BBBBB","BBDBB","BDDDB","BDDDB","BDDDB","BBDBB","EEEEE"},
-                    {"CAAAC","BBBBB","BDDDB","D---D","D---D","D---D","BDDDB","EBBBE"},
-                    {"CA~AC","BBBBB","DDDDD","D---D","D---D","D---D","DDGDD","EBFBE"},
-                    {"CAAAC","BBBBB","BDDDB","D---D","D---D","D---D","BDDDB","EBBBE"},
-                    {"CCCCC","BBBBB","BBDBB","BDDDB","BDDDB","BDDDB","BBDBB","EEEEE"}
-            }))
-            .addElement('A', ofBlock(sBlockCasingsTT, 0))
-            .addElement('B', ofBlock(sBlockCasingsTT, 4))
-            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList, textureOffset + 4, 4, sBlockCasingsTT, 4))
-            .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalInputToMachineList, textureOffset + 4, 2))
-            .addElement('G', ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalOutputToMachineList, textureOffset + 4, 3))
-            .build();
     //endregion
 
     //region parameters
@@ -110,12 +108,9 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
                     return LedStatus.STATUS_WRONG;
                 }
                 v = (int) v;
-                if (v == 0)
-                    return LedStatus.STATUS_NEUTRAL;
-                if (v >= SCAN_GET_CLASS_TYPE)
-                    return LedStatus.STATUS_TOO_HIGH;
-                if (v < 0)
-                    return LedStatus.STATUS_TOO_LOW;
+                if (v == 0) return LedStatus.STATUS_NEUTRAL;
+                if (v >= SCAN_GET_CLASS_TYPE) return LedStatus.STATUS_TOO_HIGH;
+                if (v < 0) return LedStatus.STATUS_TOO_LOW;
                 return LedStatus.STATUS_OK;
             };
     protected Parameters.Group.ParameterIn[] scanConfiguration;
@@ -214,7 +209,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        if (!structureCheck_EM("main", 2, 2, 0)) {
+        if (!structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0)) {
             return false;
         }
         return eInputHatches.size() == 1 && eOutputHatches.size() == 1 && eOutputHatches.get(0).getBaseMetaTileEntity().getFrontFacing() == iGregTechTileEntity.getFrontFacing();
@@ -223,11 +218,11 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         eRecipe = null;
-        if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContainerHandler().hasStacks() && !eOutputHatches.isEmpty()) {
-            cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContainerHandler();
+        if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContentHandler().hasStacks() && !eOutputHatches.isEmpty()) {
+            cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContentHandler();
             if (ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) {
                 GT_Recipe scannerRecipe = null;
-                for (cElementalInstanceStack stackEM : researchEM.values()) {
+                for (cElementalInstanceStack stackEM : researchEM.valuesToArray()) {
                     objectsScanned = null;
                     eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.definition);
                     if (eRecipe != null) {
@@ -263,7 +258,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             } else if (CustomItemList.scanContainer.isStackEqual(itemStack, false, true)) {
                 eRecipe = null;
                 if (researchEM.hasStacks()) {
-                    objectsScanned = researchEM.takeAllToNewMap();
+                    objectsScanned = researchEM.takeAll();
                     cleanMassEM_EM(objectsScanned.getMass());
 
                     computationRequired = 0;
@@ -352,31 +347,21 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
 
         return new String[]{
                 translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":",
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU",
+                EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
+                        EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU",
                 (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") +
-                        EnumChatFormatting.RED + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t " +
-                        translateToLocalFormatted("tt.keyword.at", clientLocale) + " " +
-                        EnumChatFormatting.RED + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A",
-                translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " +
-                        EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + " " +
-                        translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " +
-                        EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET + " A",
-                translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " +
-                        EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " " +
-                        translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " +
-                        EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
-                translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " +
-                        EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + " " +
-                        translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " +
-                        EnumChatFormatting.BLUE + eSafeVoid,
-                translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " +
-                        EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eAvailableData) + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET,
+                        EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t " + translateToLocalFormatted("tt.keyword.at", clientLocale) + " " +
+                        EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A",
+                translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
+                        " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
+                translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
+                        " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
+                translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
+                        " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid,
+                translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET,
                 translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":",
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(computationRequired / 20L)
+                EnumChatFormatting.GREEN + Long.toString(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " +
+                        EnumChatFormatting.YELLOW + computationRequired / 20L
         };
     }
 
@@ -531,12 +516,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        structureBuild_EM("main", 2, 2, 0, hintsOnly, stackSize);
-    }
-
-    @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_scanner> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
+        Structure.builder(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 30c9c509ec..ba6ae223f6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -2,26 +2,25 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-
-import com.github.technus.tectech.mechanics.structure.Structure;
-import com.gtnewhorizon.structurelib.StructureLibAPI;
-import com.gtnewhorizon.structurelib.alignment.IAlignment;
-import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
-import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
-import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
-import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
-import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.util.Vec3Impl;
-import cpw.mods.fml.common.network.NetworkRegistry;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.loader.NetworkDispatcher;
+import com.github.technus.tectech.mechanics.alignment.AlignmentLimits;
+import com.github.technus.tectech.mechanics.alignment.AlignmentMessage;
+import com.github.technus.tectech.mechanics.alignment.IAlignment;
+import com.github.technus.tectech.mechanics.alignment.IAlignmentLimits;
+import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
+import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
+import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
+import com.github.technus.tectech.mechanics.structure.Structure;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.Vec3Impl;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -33,7 +32,6 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.*;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
-import gregtech.api.util.IGT_HatchAdder;
 import gregtech.common.GT_Pollution;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -146,7 +144,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     private boolean explodedThisTick = false;
 
     //front rotation val
-    private IAlignmentLimits alignmentLimits = IAlignmentLimits.UNLIMITED;
+    private IAlignmentLimits alignmentLimits = AlignmentLimits.UNLIMITED;
     private ExtendedFacing extendedFacing = ExtendedFacing.DEFAULT;
     //endregion
 
@@ -177,12 +175,9 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             IGregTechTileEntity base = getBaseMetaTileEntity();
             mMachine = false;
             if (getBaseMetaTileEntity().isServerSide()) {
-                //NetworkDispatcher.INSTANCE.sendToAllAround(new AlignmentMessage.AlignmentData(this),
-                //        base.getWorld().provider.dimensionId,
-                //        base.getXCoord(), base.getYCoord(), base.getZCoord(), 512);
-                StructureLibAPI.sendAlignment((IAlignmentProvider) base,
-                        new NetworkRegistry.TargetPoint(base.getWorld().provider.dimensionId,
-                                base.getXCoord(), base.getYCoord(), base.getZCoord(), 512));
+                NetworkDispatcher.INSTANCE.sendToAllAround(new AlignmentMessage.AlignmentData(this),
+                        base.getWorld().provider.dimensionId,
+                        base.getXCoord(), base.getYCoord(), base.getZCoord(), 512);
             }else{
                 base.issueTextureUpdate();
             }
@@ -194,6 +189,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         return alignmentLimits;
     }
 
+    @Override
+    public void setAlignmentLimits(IAlignmentLimits limits) {
+        alignmentLimits=limits;
+    }
+
     @Override
     public boolean isFacingValid(byte aFacing) {
         return canSetToDirectionAny(ForgeDirection.getOrientation(aFacing));
@@ -237,7 +237,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             String[][] structure,//0-9 casing, +- air no air, a-z ignore
             Block[] blockType,//use numbers 0-9 for casing types
             byte[] blockMeta,//use numbers 0-9 for casing types
-            IGT_HatchAdder<T>[] addingMethods,
+            IHatchAdder<T>[] addingMethods,
             short[] casingTextures,
             Block[] blockTypeFallback,//use numbers 0-9 for casing types
             byte[] blockMetaFallback,//use numbers 0-9 for casing types
@@ -387,23 +387,21 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
         return new String[]{
                 "Progress:",
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s",
+                EnumChatFormatting.GREEN + Integer.toString(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " +
+                        EnumChatFormatting.YELLOW + mMaxProgresstime / 20 + EnumChatFormatting.RESET + " s",
                 "Energy Hatches:",
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU",
+                EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
+                        EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU",
                 (mEUt * eAmpereFlow <= 0 ? "Probably uses: " : "Probably makes: ") +
-                        EnumChatFormatting.RED + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t at " +
-                        EnumChatFormatting.RED + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A",
-                "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
-                        " Amp Rating: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET + " A",
+                        EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t at " +
+                        EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A",
+                "Tier Rating: " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
+                        " Amp Rating: " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
                 "Problems: " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
                         " Efficiency: " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
                 "PowerPass: " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
                         " SafeVoid: " + EnumChatFormatting.BLUE + eSafeVoid,
-                "Computation: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eAvailableData) + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET
+                "Computation: " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET
         };
     }
 
@@ -650,9 +648,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
      */
     protected long getAvailableData_EM() {
         long result = 0;
-        Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity().getXCoord(),
-                                    getBaseMetaTileEntity().getYCoord(),
-                                    getBaseMetaTileEntity().getZCoord());
+        Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity());
         for (GT_MetaTileEntity_Hatch_InputData in : eInputData) {
             if (in.q != null) {
                 Long value = in.q.contentIfNotInTrace(pos);
@@ -1099,7 +1095,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     public final void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         isFacingValid(aBaseMetaTileEntity.getFrontFacing());
         if (getBaseMetaTileEntity().isClientSide()) {
-            StructureLibAPI.queryAlignment((IAlignmentProvider) aBaseMetaTileEntity);
+            NetworkDispatcher.INSTANCE.sendToServer(new AlignmentMessage.AlignmentQuery(this));
         }
         onFirstTick_EM(aBaseMetaTileEntity);
     }
@@ -1301,26 +1297,26 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             }
             double remaining = voider.overflowMax - voider.getOverflowMatter();
             for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-                for (cElementalInstanceStack instance : in.getContainerHandler().values()) {
+                for (cElementalInstanceStack instance : in.getContentHandler().valuesToArray()) {
                     double qty = div(remaining,instance.definition.getMass());
                     if (qty > 0) {
                         qty = min(qty, instance.amount);
                         if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        in.getContainerHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        in.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
                     }
                 }
             }
             for (GT_MetaTileEntity_Hatch_OutputElemental out : eOutputHatches) {
-                for (cElementalInstanceStack instance : out.getContainerHandler().values()) {
+                for (cElementalInstanceStack instance : out.getContentHandler().valuesToArray()) {
                     double qty = div(remaining,instance.definition.getMass());
                     if (qty > 0) {
                         qty = min(qty, instance.amount);
                         if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        out.getContainerHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        out.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
                     }
                 }
             }
@@ -1679,7 +1675,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             addEnergyOutput_EM((long) mEUt * (long) mEfficiency / getMaxEfficiency(aStack), eAmpereFlow);
         } else if (euFlow < 0) {
             if (!drainEnergyInput_EM(mEUt, (long) mEUt * getMaxEfficiency(aStack) / Math.max(1000L, mEfficiency), eAmpereFlow)) {
-                criticalStopMachine();
+                stopMachine();
                 return false;
             }
         }
@@ -1692,7 +1688,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             addEnergyOutput_EM((long) mEUt * (long) mEfficiency / getMaxEfficiency(aStack), eAmpereFlow);
         } else if (euFlow < 0) {
             if (!drainEnergyInput((long) mEUt * getMaxEfficiency(aStack) / Math.max(1000L, mEfficiency), eAmpereFlow)) {
-                criticalStopMachine();
+                stopMachine();
                 return false;
             }
         }
@@ -1936,7 +1932,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     public final cElementalInstanceStackMap getInputsClone_EM() {
         cElementalInstanceStackMap in = new cElementalInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eInputHatches) {
-            in.putUnifyAll(hatch.getContainerHandler());
+            in.putUnifyAll(hatch.getContentHandler());
         }
         return in.hasStacks() ? in : null;
     }
@@ -1945,7 +1941,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     public final cElementalInstanceStackMap getOutputsClone_EM() {
         cElementalInstanceStackMap out = new cElementalInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eOutputHatches) {
-            out.putUnifyAll(hatch.getContainerHandler());
+            out.putUnifyAll(hatch.getContentHandler());
         }
         return out.hasStacks() ? out : null;
     }
@@ -1975,7 +1971,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         if (target == null) {
             return;
         }
-        cleanMassEM_EM(target.getContainerHandler().getMass());
+        cleanMassEM_EM(target.getContentHandler().getMass());
     }
 
     public void cleanStackEM_EM(cElementalInstanceStack target) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
index 1ed1278bce..093a418056 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
@@ -116,7 +116,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         cElementalInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.values();
+        cElementalInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
         for (cElementalInstanceStack stack : stacks) {
@@ -129,7 +129,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
             randomStack.amount= sub(randomStack.amount,amountToRemove);//mutates the parent InstanceStackMap
             if (randomStack.amount <= 0) {
                 input.remove(randomStack.definition);
-                stacks = input.values();
+                stacks = input.valuesToArray();
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
             excessMass += mass;
@@ -162,7 +162,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
 
 
         //take all from hatch handler and put into new map - this takes from hatch to inner data storage
-        stacks = input.takeAllToNewMap().values();//cleanup stacks
+        stacks = input.takeAll().valuesToArray();//cleanup stacks
         if (stacks.length > 1) {
             Arrays.sort(stacks, (o1, o2) -> {
                 double m1 = o1.definition.getMass();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
index df21feb9f2..d335bac7ab 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
index 40e2942bab..6ac6ac74c4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
@@ -147,7 +147,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
         cElementalInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.values();
+        cElementalInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
         for (cElementalInstanceStack stack : stacks) {
@@ -185,7 +185,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
         double levelsCountPlus1=precisionFullIn-precisionMinimalIn+1;
 
         //take all from hatch handler and put into new map - this takes from hatch to inner data storage
-        stacks = input.takeAllToNewMap().values();//cleanup stacks
+        stacks = input.takeAll().valuesToArray();//cleanup stacks
         for(cElementalInstanceStack stack:stacks){
             double charge=stack.definition.getCharge()-offsetIn;
             if(charge<precisionMinimalIn && charge>-precisionMinimalIn){
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
index cd6f637d61..97ece16fb1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
index c86c06b2a0..f7aa945d69 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
index 95bb8dce40..2dc9067e22 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index a43bf2b128..d9217171d3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -2,14 +2,14 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
+import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.block.QuantumStuffBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
-import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
-import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
@@ -23,11 +23,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import java.util.HashMap;
 import java.util.function.Supplier;
 
+import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
-import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
-import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -42,28 +41,26 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
     //endregion
 
     //region structure
+    private static final String[][] shape = new String[][]{
+            {"B0", "A   ", "0 - 0", "A   ", "B0",},
+            {"A000", "00000", "00.00", "00000", "A000",},
+            {"A121", "1---1", "2---2", "1---1", "A121",},
+            {"A131", "1---1", "3-A-3", "1---1", "A131",},
+            {"A121", "1---1", "2---2", "1---1", "A121",},
+            {"A000", "00000", "00-00", "00000", "A000",},
+            {"B0", "A!!!", "0!!!0", "A!!!", "B0",},};
+    private static final Block[] blockType = new Block[]{sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMeta = new byte[]{4, 0, 5, 6};
+    private static final IHatchAdder<GT_MetaTileEntity_EM_machine>[] addingMethods = adders(
+            GT_MetaTileEntity_EM_machine::addClassicToMachineList,
+            GT_MetaTileEntity_EM_machine::addElementalToMachineList);
+    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
+    private static final byte[] blockMetaFallback = new byte[]{0, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.processing.hint.0"),//1 - Classic Hatches or High Power Casing
-            translateToLocal("gt.blockmachines.multimachine.em.processing.hint.1"),//2 - Elemental Hatches or Molecular Casing
-    };
-
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_machine> STRUCTURE_DEFINITION =
-            StructureDefinition.<GT_MetaTileEntity_EM_machine>builder()
-            .addShape("main", new String[][]{
-                    {"  A  "," AAA "," EBE "," ECE "," EBE "," AAA ","  A  "},
-                    {" DDD ","AAAAA","E---E","E---E","E---E","AAAAA"," FFF "},
-                    {"AD-DA","AA~AA","B---B","C---C","B---B","AA-AA","AFFFA"},
-                    {" DDD ","AAAAA","E---E","E---E","E---E","AAAAA"," FFF "},
-                    {"  A  "," AAA "," EBE "," ECE "," EBE "," AAA ","  A  "}
-            })
-            .addElement('A', ofBlock(sBlockCasingsTT, 4))
-            .addElement('B', ofBlock(sBlockCasingsTT, 5))
-            .addElement('C', ofBlock(sBlockCasingsTT, 6))
-            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_machine::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_machine::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
-            .build();
+            translateToLocal("gt.blockmachines.multimachine.em.processing.hint.1"),};//2 - Elemental Hatches or Molecular Casing
     //endregion
 
     //region parameters
@@ -193,7 +190,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM("main", 2, 2, 1);
+        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 1);
     }
 
     @Override
@@ -261,7 +258,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
         for (int i = 0; i < 6; i++) {
             int pointer = (int) inputMux[i].get();
             if (pointer >= 0 && pointer < eInputHatches.size()) {
-                handles[i] = eInputHatches.get(pointer).getContainerHandler();
+                handles[i] = eInputHatches.get(pointer).getContentHandler();
             }
         }
 
@@ -318,7 +315,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
         for (int i = 0; i < 6; i++) {
             int pointer = (int) outputMux[i].get();
             if (pointer >= 0 && pointer < eOutputHatches.size()) {
-                handles[i] = eOutputHatches.get(pointer).getContainerHandler();
+                handles[i] = eOutputHatches.get(pointer).getContentHandler();
             }
         }
         //output
@@ -357,12 +354,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        structureBuild_EM("main", 2, 2, 1, hintsOnly, stackSize);
-    }
-
-    @Override
-    public IStructureDefinition<GT_MetaTileEntity_EM_machine> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
+        Structure.builder(shape, blockType, blockMeta, 2, 2, 1, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
     }
 
     @Override
-- 
cgit 


From 7edde3bf8c069244dabc7138fb5c5f53ce40336d Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Mon, 17 Jan 2022 22:21:58 +0100
Subject: Cleanup EM api, encapsulate

(cherry picked from commit 27946d59f2f7c272f2f91ec393a35f5d26f5293e)
---
 .../java/com/github/technus/tectech/TecTech.java   |    8 +-
 .../tectech/compatibility/gtpp/GtppAtomLoader.java |   60 +-
 .../entity/projectiles/projectileEM.java           |   16 +-
 .../tileentity/turret/TileTurretHeadEM.java        |   16 +-
 .../tileentity/turretbase/TileTurretBaseEM.java    |    6 +-
 .../definitions/EMComplexAspectDefinition.java     |  308 ++++
 .../definitions/EMPrimalAspectDefinition.java      |   42 +
 .../definitions/dComplexAspectDefinition.java      |  308 ----
 .../definitions/ePrimalAspectDefinition.java       |   42 -
 .../transformations/AspectDefinitionCompat.java    |   20 +-
 .../AspectDefinitionCompatEnabled.java             |   68 +-
 .../thing/metaTileEntity/multi/EssentiaCompat.java |    6 +-
 .../multi/EssentiaCompatEnabled.java               |   10 +-
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |   22 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |   18 +-
 .../technus/tectech/loader/ElementalLoader.java    |   34 +-
 .../tectech/loader/recipe/RecipeLoader.java        |    8 +-
 .../tectech/loader/thing/MachineLoader.java        |    2 +-
 .../tectech/mechanics/anomaly/AnomalyHandler.java  |    8 +-
 .../elementalMatter/core/EMException.java          |   10 +
 .../elementalMatter/core/IEMContainer.java         |   12 +
 .../elementalMatter/core/commands/EMGive.java      |  160 ++
 .../elementalMatter/core/commands/EMList.java      |   95 ++
 .../elementalMatter/core/commands/GiveEM.java      |  160 --
 .../elementalMatter/core/commands/ListEM.java      |   95 --
 .../elementalMatter/core/decay/EMDecay.java        |   90 ++
 .../elementalMatter/core/decay/EMDecayResult.java  |   45 +
 .../core/decay/cElementalDecay.java                |   77 -
 .../core/decay/cElementalDecayResult.java          |   43 -
 .../elementalMatter/core/iElementalContainer.java  |   12 -
 .../core/maps/EMConstantStackMap.java              |   58 +
 .../core/maps/EMDefinitionStackMap.java            |   56 +
 .../core/maps/EMInstanceStackMap.java              |  242 +++
 .../elementalMatter/core/maps/EMStackMap.java      |   50 +
 .../elementalMatter/core/maps/IEMMapRead.java      |  275 ++++
 .../elementalMatter/core/maps/IEMMapWrite.java     |  112 ++
 .../core/maps/IEMMapWriteExact.java                |  166 ++
 .../core/maps/cElementalConstantStackMap.java      |   58 -
 .../core/maps/cElementalDefinitionStackMap.java    |   56 -
 .../core/maps/cElementalInstanceStackMap.java      |  214 ---
 .../core/maps/cElementalStackMap.java              |   50 -
 .../elementalMatter/core/maps/iElementalMapR.java  |  187 ---
 .../elementalMatter/core/maps/iElementalMapRW.java |  130 --
 .../elementalMatter/core/recipes/EMRecipe.java     |   87 +
 .../elementalMatter/core/recipes/EMRecipeMap.java  |   65 +
 .../core/recipes/rElementalRecipe.java             |   57 -
 .../core/recipes/rElementalRecipeMap.java          |   73 -
 .../core/stacks/EMDefinitionStack.java             |   73 +
 .../core/stacks/EMInstanceStack.java               |  605 +++++++
 .../elementalMatter/core/stacks/IEMStack.java      |   37 +
 .../core/stacks/cElementalDefinitionStack.java     |   88 -
 .../core/stacks/cElementalInstanceStack.java       |  566 -------
 .../core/stacks/iElementalStack.java               |   23 -
 .../elementalMatter/core/tElementalException.java  |   10 -
 .../elementalMatter/core/templates/EMComplex.java  |  135 ++
 .../core/templates/EMPrimitive.java                |  283 ++++
 .../core/templates/IEMDefinition.java              |   84 +
 .../core/templates/cElementalDefinition.java       |  135 --
 .../core/templates/cElementalPrimitive.java        |  275 ----
 .../core/templates/iElementalDefinition.java       |   85 -
 .../transformations/EMFluidDequantizationInfo.java |   43 +
 .../transformations/EMFluidQuantizationInfo.java   |   43 +
 .../transformations/EMItemDequantizationInfo.java  |   45 +
 .../transformations/EMItemQuantizationInfo.java    |   69 +
 .../EMOredictDequantizationInfo.java               |   60 +
 .../transformations/EMOredictQuantizationInfo.java |   60 +
 .../core/transformations/EMTransformationInfo.java |  172 ++
 .../core/transformations/IEMExchangeInfo.java      |   11 +
 .../transformations/aFluidDequantizationInfo.java  |   43 -
 .../transformations/aFluidQuantizationInfo.java    |   43 -
 .../transformations/aItemDequantizationInfo.java   |   45 -
 .../transformations/aItemQuantizationInfo.java     |   69 -
 .../aOredictDequantizationInfo.java                |   52 -
 .../transformations/aOredictQuantizationInfo.java  |   52 -
 .../core/transformations/bTransformationInfo.java  |  124 --
 .../core/transformations/iExchangeInfo.java        |   11 -
 .../definitions/complex/EMAtomDefinition.java      | 1694 ++++++++++++++++++++
 .../definitions/complex/EMHadronDefinition.java    |  520 ++++++
 .../definitions/complex/EMNuclideIAEA.java         |  336 ++++
 .../definitions/complex/dAtomDefinition.java       | 1678 -------------------
 .../definitions/complex/dHadronDefinition.java     |  512 ------
 .../definitions/complex/iaeaNuclide.java           |  307 ----
 .../definitions/primitive/EMBosonDefinition.java   |   45 +
 .../definitions/primitive/EMLeptonDefinition.java  |   69 +
 .../primitive/EMNeutrinoDefinition.java            |   59 +
 .../primitive/EMPrimitiveDefinition.java           |   39 +
 .../definitions/primitive/EMQuarkDefinition.java   |  106 ++
 .../primitive/cPrimitiveDefinition.java            |   39 -
 .../definitions/primitive/eBosonDefinition.java    |   45 -
 .../definitions/primitive/eLeptonDefinition.java   |   69 -
 .../definitions/primitive/eNeutrinoDefinition.java |   59 -
 .../definitions/primitive/eQuarkDefinition.java    |  106 --
 .../github/technus/tectech/recipe/TT_recipe.java   |  104 +-
 .../technus/tectech/recipe/TT_recipeAdder.java     |   22 +-
 .../item/DebugElementalInstanceContainer_EM.java   |   40 +-
 .../item/ElementalDefinitionContainer_EM.java      |   26 +-
 .../item/ElementalDefinitionScanStorage_EM.java    |    4 +-
 ...GT_MetaTileEntity_Hatch_ElementalContainer.java |   22 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       |  251 +--
 .../multi/GT_MetaTileEntity_EM_decay.java          |   22 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |   38 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   48 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        |   48 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |   52 +-
 .../multi/em_machine/Behaviour_Centrifuge.java     |   69 +-
 .../multi/em_machine/Behaviour_Electrolyzer.java   |    4 +-
 .../Behaviour_ElectromagneticSeparator.java        |   47 +-
 .../multi/em_machine/Behaviour_PrecisionLaser.java |    4 +-
 .../multi/em_machine/Behaviour_Recycler.java       |    6 +-
 .../multi/em_machine/Behaviour_Scanner.java        |    4 +-
 .../em_machine/GT_MetaTileEntity_EM_machine.java   |   10 +-
 .../tectech/thing/metaTileEntity/multi/other todo  |    4 +-
 .../github/technus/tectech/util/DoubleCount.java   |  122 +-
 113 files changed, 7090 insertions(+), 6618 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 809a7e877d..ef5e146bfa 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -9,8 +9,8 @@ import com.github.technus.tectech.mechanics.commands.ConvertFloat;
 import com.github.technus.tectech.mechanics.commands.ConvertInteger;
 import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerPersistence;
-import com.github.technus.tectech.mechanics.elementalMatter.core.commands.GiveEM;
-import com.github.technus.tectech.mechanics.elementalMatter.core.commands.ListEM;
+import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMGive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMList;
 import com.github.technus.tectech.proxy.CommonProxy;
 import com.github.technus.tectech.util.XSTR;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -203,9 +203,9 @@ public class TecTech {
     public void serverLoad(FMLServerStartingEvent pEvent) {
         pEvent.registerServerCommand(new ConvertInteger());
         pEvent.registerServerCommand(new ConvertFloat());
-        pEvent.registerServerCommand(new ListEM());
+        pEvent.registerServerCommand(new EMList());
         if(DEBUG_MODE) {
-            pEvent.registerServerCommand(new GiveEM());
+            pEvent.registerServerCommand(new EMGive());
             pEvent.registerServerCommand(new CancerCommand());
             pEvent.registerServerCommand(new ChargeCommand());
         }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index 72cee6d7aa..73d2955548 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -1,14 +1,14 @@
 package com.github.technus.tectech.compatibility.gtpp;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.lang.reflect.Method;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.*;
 
 public class GtppAtomLoader implements Runnable{
     //region reflect a bit
@@ -67,34 +67,34 @@ public class GtppAtomLoader implements Runnable{
         }
         //endregion
 
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
         generate("GERMANIUM",true,true);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
 
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
 
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index a0b6106151..d594a826bc 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.block.Block;
@@ -44,25 +44,25 @@ public class projectileEM extends LaserProjectile {
         }
     }
 
-    public projectileEM(World par1World, TurretBase turretBase, cElementalInstanceStack projectileContent) {
+    public projectileEM(World par1World, TurretBase turretBase, EMInstanceStack projectileContent) {
         super(par1World, turretBase);
         this.turretBase = turretBase;
         if(projectileContent != null){
             mass=projectileContent.getMass();
             charge=projectileContent.getCharge();
-            massFactor =(float) (projectileContent.definition.getMass()/ dHadronDefinition.hadron_n_.getMass());
+            massFactor =(float) (projectileContent.getDefinition().getMass()/ EMHadronDefinition.hadron_n_.getMass());
 
-            if(projectileContent.definition.getType()>1 || projectileContent.definition.getType()<-1) {
+            if(projectileContent.getDefinition().getType()>1 || projectileContent.getDefinition().getType()<-1) {
                 strange = true;
             }
-            if(projectileContent.definition.getType()<0) {
+            if(projectileContent.getDefinition().getType()<0) {
                 antiMatter = true;
             }
 
-            if (projectileContent.definition.getCharge() == 0) {
+            if (projectileContent.getDefinition().getCharge() == 0) {
                 gravity = massFactor / 100f;
             } else {
-                gravity = Math.min(0.0025F / Math.abs(projectileContent.definition.getCharge()), massFactor / 100f);
+                gravity = Math.min(0.0025F / Math.abs(projectileContent.getDefinition().getCharge()), massFactor / 100f);
             }
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index e027c83107..6dc5c4f60a 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.t
 
 import com.github.technus.tectech.compatibility.openmodularturrets.entity.projectiles.projectileEM;
 import com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase.TileTurretBaseEM;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
@@ -14,13 +14,13 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 
 /**
  * Created by Bass on 27/07/2017.
  */
 public class TileTurretHeadEM extends TurretHead{
-    private cElementalInstanceStackMap hatchContentPointer;
+    private EMInstanceStackMap hatchContentPointer;
 
     @Override
     public int getTurretRange() {
@@ -70,11 +70,11 @@ public class TileTurretHeadEM extends TurretHead{
         if (hatchContentPointer == null || hatchContentPointer.isEmpty()) {
             return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
         }
-        cElementalInstanceStack stack = hatchContentPointer.getRandom();
-        double amount = Math.min(AVOGADRO_CONSTANT,stack.amount);
-        hatchContentPointer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+        EMInstanceStack stack  = hatchContentPointer.getRandom();
+        double          amount = Math.min(AVOGADRO_CONSTANT, stack.getAmount());
+        hatchContentPointer.removeAmount(stack.getDefinition(),AVOGADRO_CONSTANT);
         stack=stack.clone();
-        stack.amount = amount;
+        stack.setAmount(amount);
         return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
index a5d64fb886..0dbc33e007 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.openmodularturrets.tileentity.turretbase;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import cpw.mods.fml.common.Optional;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -25,7 +25,7 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
         return "turretBaseEM";
     }
 
-    public final cElementalInstanceStackMap getContainerHandler() {
+    public final EMInstanceStackMap getContainerHandler() {
         World worldIn = getWorldObj();
         TileEntity te;
         if ((te = worldIn.getTileEntity(xCoord + 1, yCoord, zCoord)) instanceof IGregTechTileEntity &&
@@ -61,7 +61,7 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity {
         return null;
     }
 
-    private cElementalInstanceStackMap getFromHatch(GT_MetaTileEntity_Hatch_InputElemental hatch) {
+    private EMInstanceStackMap getFromHatch(GT_MetaTileEntity_Hatch_InputElemental hatch) {
         hatch.updateTexture((byte) 8,(byte) 4);
         return hatch.getContentHandler();
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
new file mode 100644
index 0000000000..432d151b80
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -0,0 +1,308 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
+import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by Tec on 06.05.2017.
+ */
+public final class EMComplexAspectDefinition extends EMComplex {
+    private final int    hash;
+    private final double mass;
+
+    private static final byte nbtType = (byte) 'c';
+
+    private final EMConstantStackMap aspectStacks;
+
+    public EMComplexAspectDefinition(EMDefinitionStack... aspects) throws EMException {
+        this(true, new EMConstantStackMap(aspects));
+    }
+
+    private EMComplexAspectDefinition(boolean check, EMDefinitionStack... aspects) throws EMException {
+        this(check, new EMConstantStackMap(aspects));
+    }
+
+    public EMComplexAspectDefinition(EMConstantStackMap aspects) throws EMException {
+        this(true, aspects);
+    }
+
+    private EMComplexAspectDefinition(boolean check, EMConstantStackMap aspects) throws EMException {
+        if (check && !canTheyBeTogether(aspects)) {
+            throw new EMException("Hadron Definition error");
+        }
+        aspectStacks = aspects;
+        float mass = 0;
+        for (EMDefinitionStack stack : aspects.valuesToArray()) {
+            mass += stack.getMass();
+        }
+        this.mass = mass;
+        hash = super.hashCode();
+    }
+
+    //public but u can just try{}catch(){} the constructor it still calls this method
+    private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
+        long amount = 0;
+        for (EMDefinitionStack aspects : stacks.valuesToArray()) {
+            if (!(aspects.getDefinition() instanceof EMComplexAspectDefinition) && !(aspects.getDefinition() instanceof EMPrimalAspectDefinition)) {
+                return false;
+            }
+            if((int) aspects.getAmount() != aspects.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            amount += aspects.getAmount();
+        }
+        return amount == 2;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this);
+        if (name != null) {
+            name = name.substring(0, 1).toUpperCase() + name.substring(1);
+        } else {
+            name = getSymbol();
+        }
+        return translateToLocal("tt.keyword.Aspect") + ": " + name;
+    }
+
+    @Override
+    public String getSymbol() {
+        StringBuilder symbol = new StringBuilder(8);
+        for (EMDefinitionStack aspect : aspectStacks.valuesToArray()) {
+            if (aspect.getDefinition() instanceof EMPrimalAspectDefinition) {
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getSymbol());
+                }
+            } else {
+                symbol.append('(');
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getSymbol());
+                }
+                symbol.append(')');
+            }
+        }
+        return symbol.toString();
+    }
+
+    @Override
+    public String getShortSymbol() {
+        StringBuilder symbol = new StringBuilder(8);
+        for (EMDefinitionStack aspect : aspectStacks.valuesToArray()) {
+            if (aspect.getDefinition() instanceof EMPrimalAspectDefinition) {
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getShortSymbol());
+                }
+            } else {
+                symbol.append('(');
+                for (int i = 0; i < aspect.getAmount(); i++) {
+                    symbol.append(aspect.getDefinition().getShortSymbol());
+                }
+                symbol.append(')');
+            }
+        }
+        return symbol.toString();
+    }
+
+    @Override
+    public NBTTagCompound toNBT() {
+        return getNbtTagCompound(nbtType, aspectStacks);
+    }
+
+    public static NBTTagCompound getNbtTagCompound(byte nbtType, EMConstantStackMap aspectStacks) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setByte("t", nbtType);
+        EMDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
+        nbt.setInteger("i", quarkStacksValues.length);
+        for (int i = 0; i < quarkStacksValues.length; i++) {
+            nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
+        }
+        return nbt;
+    }
+
+    public static EMComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
+        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < stacks.length; i++) {
+            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+        }
+        try {
+            return new EMComplexAspectDefinition(stacks);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return -1;
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+
+    @Override
+    public int getCharge() {
+        return 0;
+    }
+
+    @Override
+    public byte getType() {
+        return 0;
+    }
+
+    @Override
+    public byte getColor() {
+        return -1;
+    }
+
+    @Override
+    public EMConstantStackMap getSubParticles() {
+        return aspectStacks;
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        return new EMDecay[]{new EMDecay(0.75F, aspectStacks), EMBosonDefinition.deadEnd};
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        return NO_DECAY;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        return NO_DECAY;
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public IEMDefinition getAnti() {
+        return null;
+    }
+
+    public static void run() {
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if (DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96);
+        }
+    }
+
+    @Override
+    public byte getClassType() {
+        return -96;
+    }
+
+    public static byte getClassTypeStatic() {
+        return -96;
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType());
+        }
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.NAME") + " = " + getLocalizedName());
+            //lines.add("SYMBOL = "+getSymbol());
+        }
+        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
+        }
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add(getColor() < 0 ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
+        }
+        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
+            lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
+        }
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(translateToLocal("tt.keyphrase.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s");
+            lines.add("    " + translateToLocal("tt.keyphrase.At_current_energy_level"));
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
new file mode 100644
index 0000000000..bf9703d6d7
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -0,0 +1,42 @@
+package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by Tec on 06.05.2017.
+ */
+public final class EMPrimalAspectDefinition extends EMPrimitive {
+    public static final EMPrimalAspectDefinition
+            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
+            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
+            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 33),
+            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 32),
+            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 30),
+            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Entropy"), "e`", 1e5D, 31);
+
+    private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID) {
+        super(name, symbol, 0, mass, 0, -1, ID);
+    }
+
+    public static void run() {
+        magic_air.init(null, -1F, -1, -1, NO_DECAY);
+        magic_earth.init(null, -1F, -1, -1, NO_DECAY);
+        magic_fire.init(null, -1F, -1, -1, NO_DECAY);
+        magic_water.init(null, -1F, -1, -1, NO_DECAY);
+        magic_order.init(null, -1F, -1, -1, NO_DECAY);
+        magic_entropy.init(null, -1F, -1, -1, NO_DECAY);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.Primal") + ": " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
deleted file mode 100644
index 98ad5bbf63..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/dComplexAspectDefinition.java
+++ /dev/null
@@ -1,308 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
-import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by Tec on 06.05.2017.
- */
-public final class dComplexAspectDefinition extends cElementalDefinition {
-    private final int hash;
-    public final double mass;
-
-    private static final byte nbtType = (byte) 'c';
-
-    private final cElementalConstantStackMap aspectStacks;
-
-    public dComplexAspectDefinition(cElementalDefinitionStack... aspects) throws tElementalException {
-        this(true, new cElementalConstantStackMap(aspects));
-    }
-
-    private dComplexAspectDefinition(boolean check, cElementalDefinitionStack... aspects) throws tElementalException {
-        this(check, new cElementalConstantStackMap(aspects));
-    }
-
-    public dComplexAspectDefinition(cElementalConstantStackMap aspects) throws tElementalException {
-        this(true, aspects);
-    }
-
-    private dComplexAspectDefinition(boolean check, cElementalConstantStackMap aspects) throws tElementalException {
-        if (check && !canTheyBeTogether(aspects)) {
-            throw new tElementalException("Hadron Definition error");
-        }
-        aspectStacks = aspects;
-        float mass = 0;
-        for (cElementalDefinitionStack stack : aspects.valuesToArray()) {
-            mass += stack.getMass();
-        }
-        this.mass = mass;
-        hash = super.hashCode();
-    }
-
-    //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
-        long amount = 0;
-        for (cElementalDefinitionStack aspects : stacks.valuesToArray()) {
-            if (!(aspects.definition instanceof dComplexAspectDefinition) && !(aspects.definition instanceof ePrimalAspectDefinition)) {
-                return false;
-            }
-            if((int)aspects.amount!=aspects.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            amount += aspects.amount;
-        }
-        return amount == 2;
-    }
-
-    @Override
-    public String getName() {
-        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this);
-        if (name != null) {
-            name = name.substring(0, 1).toUpperCase() + name.substring(1);
-        } else {
-            name = getSymbol();
-        }
-        return translateToLocal("tt.keyword.Aspect") + ": " + name;
-    }
-
-    @Override
-    public String getSymbol() {
-        StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
-            if (aspect.definition instanceof ePrimalAspectDefinition) {
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getSymbol());
-                }
-            } else {
-                symbol.append('(');
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getSymbol());
-                }
-                symbol.append(')');
-            }
-        }
-        return symbol.toString();
-    }
-
-    @Override
-    public String getShortSymbol() {
-        StringBuilder symbol = new StringBuilder(8);
-        for (cElementalDefinitionStack aspect : aspectStacks.valuesToArray()) {
-            if (aspect.definition instanceof ePrimalAspectDefinition) {
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getShortSymbol());
-                }
-            } else {
-                symbol.append('(');
-                for (int i = 0; i < aspect.amount; i++) {
-                    symbol.append(aspect.definition.getShortSymbol());
-                }
-                symbol.append(')');
-            }
-        }
-        return symbol.toString();
-    }
-
-    @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, aspectStacks);
-    }
-
-    public static NBTTagCompound getNbtTagCompound(byte nbtType, cElementalConstantStackMap aspectStacks) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        cElementalDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
-        nbt.setInteger("i", quarkStacksValues.length);
-        for (int i = 0; i < quarkStacksValues.length; i++) {
-            nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
-        }
-        return nbt;
-    }
-
-    public static dComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new dComplexAspectDefinition(stacks);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return -1;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return false;
-    }
-
-    @Override
-    public int getCharge() {
-        return 0;
-    }
-
-    @Override
-    public byte getType() {
-        return 0;
-    }
-
-    @Override
-    public byte getColor() {
-        return -1;
-    }
-
-    @Override
-    public cElementalConstantStackMap getSubParticles() {
-        return aspectStacks;
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        return new cElementalDecay[]{new cElementalDecay(0.75F, aspectStacks), eBosonDefinition.deadEnd};
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        return noDecay;
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        return noDecay;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public iElementalDefinition getAnti() {
-        return null;
-    }
-
-    public static void run() {
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, dComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if (DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96);
-        }
-    }
-
-    @Override
-    public byte getClassType() {
-        return -96;
-    }
-
-    public static byte getClassTypeStatic() {
-        return -96;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType());
-        }
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.NAME") + " = " + getName());
-            //lines.add("SYMBOL = "+getSymbol());
-        }
-        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
-        }
-        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
-            lines.add(getColor() < 0 ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
-        }
-        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
-        }
-        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(translateToLocal("tt.keyphrase.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s");
-            lines.add("    " + translateToLocal("tt.keyphrase.At_current_energy_level"));
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
deleted file mode 100644
index 5db067a552..0000000000
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/ePrimalAspectDefinition.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by Tec on 06.05.2017.
- */
-public final class ePrimalAspectDefinition extends cElementalPrimitive {
-    public static final ePrimalAspectDefinition
-            magic_air = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
-            magic_earth = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
-            magic_fire = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 33),
-            magic_water = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 32),
-            magic_order = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 30),
-            magic_entropy = new ePrimalAspectDefinition(translateToLocal("tt.keyword.Entropy"), "e`", 1e5D, 31);
-
-    private ePrimalAspectDefinition(String name, String symbol, double mass, int ID) {
-        super(name, symbol, 0, mass, 0, -1, ID);
-    }
-
-    public static void run() {
-        magic_air.init(null, -1F, -1, -1, noDecay);
-        magic_earth.init(null, -1F, -1, -1, noDecay);
-        magic_fire.init(null, -1F, -1, -1, noDecay);
-        magic_water.init(null, -1F, -1, -1, noDecay);
-        magic_order.init(null, -1F, -1, -1, noDecay);
-        magic_entropy.init(null, -1F, -1, -1, noDecay);
-    }
-
-    @Override
-    public String getName() {
-        return translateToLocal("tt.keyword.Primal") + ": " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
index 343071e26e..c7f38eb21d 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
 
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 
 import java.util.HashMap;
 
@@ -9,21 +9,25 @@ import java.util.HashMap;
  * Created by Tec on 21.05.2017.
  */
 public class AspectDefinitionCompat {
-    public static AspectDefinitionCompat aspectDefinitionCompat;
-    public final HashMap<iElementalDefinition,String> defToAspect = new HashMap<>();
-    public final HashMap<String,iElementalDefinition> aspectToDef = new HashMap<>();
+    public static AspectDefinitionCompat         aspectDefinitionCompat;
+    private final HashMap<IEMDefinition,String>  defToAspect = new HashMap<>();
+    private final HashMap<String, IEMDefinition> aspectToDef = new HashMap<>();
 
     public void run(){}
 
-    public Object getAspect(iElementalDefinition definition){
+    public String getAspectTag(IEMDefinition definition){
         return null;
     }
 
-    public String getAspectTag(iElementalDefinition definition){
+    public IEMDefinition getDefinition(String aspect){
         return null;
     }
 
-    public iElementalDefinition getDefinition(String aspect){
-        return null;
+    public HashMap<IEMDefinition, String> getDefToAspect() {
+        return defToAspect;
+    }
+
+    public HashMap<String, IEMDefinition> getAspectToDef() {
+        return aspectToDef;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
index 446e9b66d5..c9ca5d7b9f 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -1,13 +1,13 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
 
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import thaumcraft.api.aspects.Aspect;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition.*;
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*;
 import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
 
 /**
@@ -16,19 +16,19 @@ import static com.github.technus.tectech.thing.item.DebugElementalInstanceContai
 public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
     @Override
     public void run(){
-        defToAspect.put(magic_air,"aer");
-        defToAspect.put(magic_earth,"terra");
-        defToAspect.put(magic_fire,"ignis");
-        defToAspect.put(magic_water,"aqua");
-        defToAspect.put(magic_order,"ordo");
-        defToAspect.put(magic_entropy,"perditio");
+        getDefToAspect().put(magic_air,"aer");
+        getDefToAspect().put(magic_earth,"terra");
+        getDefToAspect().put(magic_fire,"ignis");
+        getDefToAspect().put(magic_water,"aqua");
+        getDefToAspect().put(magic_order,"ordo");
+        getDefToAspect().put(magic_entropy,"perditio");
 
-        aspectToDef.put("aer",magic_air);
-        aspectToDef.put("terra",magic_earth);
-        aspectToDef.put("ignis",magic_fire);
-        aspectToDef.put("aqua",magic_water);
-        aspectToDef.put("ordo",magic_order);
-        aspectToDef.put("perditio",magic_entropy);
+        getAspectToDef().put("aer",magic_air);
+        getAspectToDef().put("terra",magic_earth);
+        getAspectToDef().put("ignis",magic_fire);
+        getAspectToDef().put("aqua",magic_water);
+        getAspectToDef().put("ordo",magic_order);
+        getAspectToDef().put("perditio",magic_entropy);
 
         ArrayList<Aspect> list=Aspect.getCompoundAspects();
         Aspect[] array= list.toArray(new Aspect[0]);
@@ -38,20 +38,20 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                     Aspect[] content = aspect.getComponents();
                     if (content.length != 2) {
                         list.remove(aspect);
-                    }else if(aspectToDef.containsKey(content[0].getTag()) && aspectToDef.containsKey(content[1].getTag())){
+                    }else if(getAspectToDef().containsKey(content[0].getTag()) && getAspectToDef().containsKey(content[1].getTag())){
                         try {
-                            dComplexAspectDefinition newAspect;
+                            EMComplexAspectDefinition newAspect;
                             if(content[0].getTag().equals(content[1].getTag())){
-                                newAspect = new dComplexAspectDefinition(
-                                        aspectToDef.get(content[0].getTag()).getStackForm(2));
+                                newAspect = new EMComplexAspectDefinition(
+                                        getAspectToDef().get(content[0].getTag()).getStackForm(2));
                             }else{
-                                newAspect = new dComplexAspectDefinition(
-                                        aspectToDef.get(content[0].getTag()).getStackForm(1),
-                                        aspectToDef.get(content[1].getTag()).getStackForm(1));
+                                newAspect = new EMComplexAspectDefinition(
+                                        getAspectToDef().get(content[0].getTag()).getStackForm(1),
+                                        getAspectToDef().get(content[1].getTag()).getStackForm(1));
                             }
-                            aspectToDef.put(aspect.getTag(),newAspect);
-                            defToAspect.put(newAspect,aspect.getTag());
-                        }catch (tElementalException e) {
+                            getAspectToDef().put(aspect.getTag(),newAspect);
+                            getDefToAspect().put(newAspect,aspect.getTag());
+                        }catch (EMException e) {
                             /**/
                         }finally {
                             list.remove(aspect);
@@ -60,22 +60,16 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                 }
             }
         }
-
-        STACKS_REGISTERED.addAll(defToAspect.keySet());
-    }
-
-    @Override
-    public Aspect getAspect(iElementalDefinition definition) {
-        return Aspect.getAspect(defToAspect.get(definition));
+        STACKS_REGISTERED.addAll(getDefToAspect().keySet());
     }
 
     @Override
-    public String getAspectTag(iElementalDefinition definition) {
-        return defToAspect.get(definition);
+    public String getAspectTag(IEMDefinition definition) {
+        return getDefToAspect().get(definition);
     }
 
     @Override
-    public iElementalDefinition getDefinition(String aspect) {
-        return aspectToDef.get(aspect);
+    public IEMDefinition getDefinition(String aspect) {
+        return getAspectToDef().get(aspect);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
index 63f55912a6..d51bc8dc2d 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 
@@ -18,7 +18,7 @@ public class EssentiaCompat {
         return null;
     }
 
-    public String getEssentiaName(iElementalDefinition stack){
+    public String getEssentiaName(IEMDefinition stack){
         return null;
     }
 
@@ -26,7 +26,7 @@ public class EssentiaCompat {
         return false;
     }
 
-    public iElementalDefinition getFromContainer(TileEntity container){
+    public IEMDefinition getFromContainer(TileEntity container){
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
index 03ff92b4e0..ab682ba1a5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 import thaumcraft.api.aspects.Aspect;
@@ -28,8 +28,8 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
     }
 
     @Override
-    public String getEssentiaName(iElementalDefinition stack) {
-        return aspectDefinitionCompat.defToAspect.get(stack);
+    public String getEssentiaName(IEMDefinition stack) {
+        return aspectDefinitionCompat.getDefToAspect().get(stack);
     }
 
     @Override
@@ -49,7 +49,7 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
     }
 
     @Override
-    public iElementalDefinition getFromContainer(TileEntity container){
+    public IEMDefinition getFromContainer(TileEntity container){
         if(container==null || container.isInvalid()) {
             return null;
         }
@@ -59,7 +59,7 @@ public class EssentiaCompatEnabled extends EssentiaCompat {
                 Aspect[] aspectsArr= aspects.getAspects();
                 if(aspectsArr!=null && aspectsArr[0]!=null){
                      if (((IAspectContainer) container).takeFromContainer(aspectsArr[0],1)){
-                         return aspectDefinitionCompat.aspectToDef.get(aspectsArr[0].getTag());
+                         return aspectDefinitionCompat.getAspectToDef().get(aspectsArr[0].getTag());
                      }
                 }
             }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index c939f10d6b..dbcbe7d86b 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -2,8 +2,8 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -26,8 +26,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -94,24 +94,24 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
             return false;
         }
 
-        cElementalInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContentHandler();
+        EMInstanceStackMap inputHatchContainer = eInputHatches.get(0).getContentHandler();
         if (inputHatchContainer == null || !inputHatchContainer.hasStacks()) {
             return false;
         }
 
-        cElementalInstanceStack stack = inputHatchContainer.getRandom();
-        if (stack.amount < AVOGADRO_CONSTANT_DIMINISHED) {
-            cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+        EMInstanceStack stack = inputHatchContainer.getRandom();
+        if (stack.getAmount() < AVOGADRO_CONSTANT_DIMINISHED) {
+            cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
             mEUt = (int) -V[6];
         } else {
-            outputEssentiaName = essentiaContainerCompat.getEssentiaName(stack.definition);
+            outputEssentiaName = essentiaContainerCompat.getEssentiaName(stack.getDefinition());
             Aspect aspect = Aspect.getAspect(outputEssentiaName);
             if (aspect == null) {
                 outputEssentiaName = null;
-                cleanStackEM_EM(inputHatchContainer.remove(stack.definition));
+                cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
                 mEUt = (int) -V[7];
             } else {
-                inputHatchContainer.removeAmount(false, stack.definition.getStackForm(AVOGADRO_CONSTANT));
+                inputHatchContainer.removeAmount(stack.getDefinition().getStackForm(AVOGADRO_CONSTANT));
                 if (aspect.isPrimal()) {
                     mEUt = (int) -V[8];
                 } else {
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 62ac339155..5606442c37 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -1,11 +1,11 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -25,7 +25,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -84,15 +84,15 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
-        iElementalDefinition definition  = essentiaContainerCompat.getFromContainer(essentiaContainerCompat.getContainer(this));
+        IEMDefinition definition = essentiaContainerCompat.getFromContainer(essentiaContainerCompat.getContainer(this));
         if (definition != null) {
             mMaxProgresstime = 20;
             mEfficiencyIncrease = 10000;
             eAmpereFlow = 1;
-            outputEM = new cElementalInstanceStackMap[]{
-                    new cElementalInstanceStackMap(new cElementalInstanceStack(definition,AVOGADRO_CONSTANT))
+            outputEM = new EMInstanceStackMap[]{
+                    new EMInstanceStackMap(new EMInstanceStack(definition,AVOGADRO_CONSTANT))
             };
-            if (definition instanceof ePrimalAspectDefinition) {
+            if (definition instanceof EMPrimalAspectDefinition) {
                 mEUt = (int) -V[8];
             } else {
                 mEUt = (int) -V[10];
diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index b481b82646..7ce371e57e 100644
--- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -1,11 +1,11 @@
 package com.github.technus.tectech.loader;
 
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.iaeaNuclide;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMNuclideIAEA;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.*;
 
 /**
@@ -18,23 +18,23 @@ public class ElementalLoader implements Runnable {
         // Definition init
         // ===================================================================================================
 
-        cElementalPrimitive.run();
+        EMPrimitive.run();
 
-        cPrimitiveDefinition.run();
+        EMPrimitiveDefinition.run();
 
-        eQuarkDefinition.run();
-        eLeptonDefinition.run();
-        eNeutrinoDefinition.run();
-        eBosonDefinition.run();
+        EMQuarkDefinition.run();
+        EMLeptonDefinition.run();
+        EMNeutrinoDefinition.run();
+        EMBosonDefinition.run();
 
-        dHadronDefinition.run();
+        EMHadronDefinition.run();
 
-        iaeaNuclide.run();
+        EMNuclideIAEA.run();
 
-        dAtomDefinition.run();
+        EMAtomDefinition.run();
 
-        ePrimalAspectDefinition.run();
+        EMPrimalAspectDefinition.run();
 
-        dComplexAspectDefinition.run();
+        EMComplexAspectDefinition.run();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
index a2e2f65384..7cd5a25f4a 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.loader.recipe;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader;
 import com.github.technus.tectech.compatibility.spartakcore.SpartakCoreRecipeLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
@@ -35,8 +35,8 @@ public class RecipeLoader implements Runnable {
 
     @Override
     public void run() {
-        dAtomDefinition.setTransformation();
-        dHadronDefinition.setTransformations();
+        EMAtomDefinition.setTransformation();
+        EMHadronDefinition.setTransformations();
 
         // ===================================================================================================
         // Recipes init - common goes here rest goes into methods below
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index 91dbffa71f..b3df7483f5 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -15,7 +15,7 @@ import cpw.mods.fml.common.Loader;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.CustomItemList.*;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index 0e1771e88d..c6ac34b66d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -7,7 +7,7 @@ import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
 import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
 import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import gregtech.api.GregTech_API;
@@ -31,11 +31,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
-    private static final double SWAP_THRESHOLD = dAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
+    private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
     private static final int COUNT_DIV=32;
     private static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
     private static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
new file mode 100644
index 0000000000..23ca5d77d9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
@@ -0,0 +1,10 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core;
+
+/**
+ * Created by danie_000 on 19.11.2016.
+ */
+public final class EMException extends Exception {
+    public EMException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java
new file mode 100644
index 0000000000..d731078988
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/IEMContainer.java
@@ -0,0 +1,12 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+
+/**
+ * Created by danie_000 on 25.01.2017.
+ */
+public interface IEMContainer {
+    EMInstanceStackMap getContentHandler();
+
+    void purgeOverflow();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
new file mode 100644
index 0000000000..64e9bcea1e
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -0,0 +1,160 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentText;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 30.12.2017.
+ */
+public class EMGive implements ICommand {
+    ArrayList<String> aliases=new ArrayList<>();
+
+    public EMGive(){
+        aliases.add("em_give");
+        aliases.add("give_em");
+        aliases.add("gib_em");
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (sender instanceof EntityPlayerMP && !sender.getEntityWorld().isRemote) {
+            if(args.length < 3) {
+                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
+            }else{
+                TecTech.LOGGER.info("Spawninig EM for "+((EntityPlayerMP) sender).getDisplayName()+" - "+Arrays.toString(args));
+
+                ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
+                String energy=list.remove(0);
+
+                EMDefinitionStack def = getDefinitionStack(list);
+                if(def!=null) {
+                    EMInstanceStack instanceStack = new EMInstanceStack(def, 1D, 0D, Long.parseLong(energy));
+
+                    sender.addChatMessage(new ChatComponentText(instanceStack.getDefinition().getSymbol() + " - " + instanceStack.getDefinition().getLocalizedName()));
+
+                    EMInstanceStackMap instanceMap = new EMInstanceStackMap(instanceStack);
+
+                    ItemStack itemStack = new ItemStack(DebugElementalInstanceContainer_EM.INSTANCE);
+                    NBTTagCompound contents = new NBTTagCompound();
+                    contents.setTag("info", instanceMap.getInfoNBT());
+                    contents.setTag("content", instanceMap.toNBT());
+                    itemStack.setTagCompound(contents);
+
+                    ((EntityPlayerMP) sender).inventory.addItemStackToInventory(itemStack);
+                }
+            }
+        }
+    }
+
+    private EMDefinitionStack getDefinitionStack(ArrayList<String> args){
+        if(args.get(0).equals("<")){
+            args.remove(0);
+            return null;
+        }
+        double amount=Double.parseDouble(args.remove(0));
+        try{
+            int id=Integer.parseInt(args.get(0));
+            args.remove(0);
+            IEMDefinition primitive = EMPrimitive.getBindsPrimitive().get(id);
+            return new EMDefinitionStack(primitive,amount);
+        }catch (NumberFormatException e){
+            byte clazz = (byte) args.remove(0).charAt(0);
+            Method constructor = EMComplex.getBindsComplex().get(clazz);
+
+            EMDefinitionStackMap stacks =new EMDefinitionStackMap();
+            while(args.size()>0){
+                EMDefinitionStack tempStack =getDefinitionStack(args);
+                if(tempStack==null) {
+                    break;
+                }else {
+                    stacks.putUnifyExact(tempStack);
+                }
+            }
+
+            try {
+                return ((IEMDefinition) constructor.invoke(null, stacks.toNBT())).getStackForm(amount);
+            } catch (Exception e1) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return nbtE__.getStackForm(amount);
+            }
+        }
+    }
+
+    @Override
+    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
+        return false;
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return aliases;
+    }
+
+    @Override
+    public String getCommandName() {
+        return aliases.get(0);
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        if(args.length==2){
+            return completionsForClassOrID();
+        }
+        return null;
+    }
+
+    private List<String> completionsForClassOrID(){
+        ArrayList<String> strings=new ArrayList<>(8);
+        Map<Byte,Method> binds= EMComplex.getBindsComplex();
+        for (Map.Entry<Byte,Method> e:binds.entrySet()) {
+            strings.add(String.valueOf((char)e.getKey().byteValue()));
+        }
+        Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
+        for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+            strings.add(String.valueOf(e.getKey().byteValue()));
+        }
+        return strings;
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender p_71518_1_) {
+        return "em_give Energy Count ClassOrId (Count ClassOrId ... <)";
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        if(o instanceof ICommand){
+            return getCommandName().compareTo(((ICommand) o).getCommandName());
+        }
+        return 0;
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
new file mode 100644
index 0000000000..395592036f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -0,0 +1,95 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by danie_000 on 30.12.2017.
+ */
+public class EMList implements ICommand {
+    ArrayList<String> aliases=new ArrayList<>();
+
+    public EMList(){
+        aliases.add("em_list");
+        aliases.add("list_em");
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (!sender.getEntityWorld().isRemote) {
+            if(args.length == 0) {
+                sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
+                Map<Byte,Method> binds= EMComplex.getBindsComplex();
+                for (Map.Entry<Byte,Method> e:binds.entrySet()) {
+                    sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
+                }
+            }else if(args.length==1){
+                sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
+                if(args[0].equals(String.valueOf((char) EMPrimitive.nbtType))){
+                    Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
+                    for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+                        sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getLocalizedName()));
+                    }
+                }else{
+                    sender.addChatMessage(new ChatComponentText("Complex definition - needs contents"));
+                }
+            }else{
+                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
+            }
+        }
+    }
+
+    @Override
+    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
+        return false;
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return aliases;
+    }
+
+    @Override
+    public String getCommandName() {
+        return aliases.get(0);
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        if(args.length==0){
+            Map<Byte,Method> binds= EMComplex.getBindsComplex();
+            ArrayList<String> strings=new ArrayList<>(binds.size());
+            for (Map.Entry<Byte,Method> e:binds.entrySet()) {
+                strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
+            }
+            return strings;
+        }
+        return null;
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender p_71518_1_) {
+        return "em_list (optional class tag)";
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        if(o instanceof ICommand){
+            return getCommandName().compareTo(((ICommand) o).getCommandName());
+        }
+        return 0;
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
deleted file mode 100644
index 8b1f6d0c14..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/GiveEM.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentText;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 30.12.2017.
- */
-public class GiveEM implements ICommand {
-    ArrayList<String> aliases=new ArrayList<>();
-
-    public GiveEM(){
-        aliases.add("em_give");
-        aliases.add("give_em");
-        aliases.add("gib_em");
-    }
-
-    @Override
-    public void processCommand(ICommandSender sender, String[] args) {
-        if (sender instanceof EntityPlayerMP && !sender.getEntityWorld().isRemote) {
-            if(args.length < 3) {
-                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
-            }else{
-                TecTech.LOGGER.info("Spawninig EM for "+((EntityPlayerMP) sender).getDisplayName()+" - "+Arrays.toString(args));
-
-                ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
-                String energy=list.remove(0);
-
-                cElementalDefinitionStack def= getDefinitionStack(list);
-                if(def!=null) {
-                    cElementalInstanceStack instanceStack = new cElementalInstanceStack(def, 1D, 0D, Long.parseLong(energy));
-
-                    sender.addChatMessage(new ChatComponentText(instanceStack.definition.getSymbol() + " - " + instanceStack.definition.getName()));
-
-                    cElementalInstanceStackMap instanceMap = new cElementalInstanceStackMap(instanceStack);
-
-                    ItemStack itemStack = new ItemStack(DebugElementalInstanceContainer_EM.INSTANCE);
-                    NBTTagCompound contents = new NBTTagCompound();
-                    contents.setTag("info", instanceMap.getInfoNBT());
-                    contents.setTag("content", instanceMap.toNBT());
-                    itemStack.setTagCompound(contents);
-
-                    ((EntityPlayerMP) sender).inventory.addItemStackToInventory(itemStack);
-                }
-            }
-        }
-    }
-
-    private cElementalDefinitionStack getDefinitionStack(ArrayList<String> args){
-        if(args.get(0).equals("<")){
-            args.remove(0);
-            return null;
-        }
-        double amount=Double.parseDouble(args.remove(0));
-        try{
-            int id=Integer.parseInt(args.get(0));
-            args.remove(0);
-            iElementalDefinition primitive=cElementalPrimitive.getBindsPrimitive().get(id);
-            return new cElementalDefinitionStack(primitive,amount);
-        }catch (NumberFormatException e){
-            byte clazz = (byte) args.remove(0).charAt(0);
-            Method constructor = cElementalDefinition.getBindsComplex().get(clazz);
-
-            cElementalDefinitionStackMap stacks =new cElementalDefinitionStackMap();
-            while(args.size()>0){
-                cElementalDefinitionStack tempStack=getDefinitionStack(args);
-                if(tempStack==null) {
-                    break;
-                }else {
-                    stacks.putUnify(tempStack);
-                }
-            }
-
-            try {
-                return ((iElementalDefinition) constructor.invoke(null, stacks.toNBT())).getStackForm(amount);
-            } catch (Exception e1) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return nbtE__.getStackForm(amount);
-            }
-        }
-    }
-
-    @Override
-    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
-        return false;
-    }
-
-    @Override
-    public List<String> getCommandAliases() {
-        return aliases;
-    }
-
-    @Override
-    public String getCommandName() {
-        return aliases.get(0);
-    }
-
-    @Override
-    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==2){
-            return completionsForClassOrID();
-        }
-        return null;
-    }
-
-    private List<String> completionsForClassOrID(){
-        ArrayList<String> strings=new ArrayList<>(8);
-        Map<Byte,Method> binds= cElementalDefinition.getBindsComplex();
-        for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-            strings.add(String.valueOf((char)e.getKey().byteValue()));
-        }
-        Map<Integer, cElementalPrimitive> bindsBO = cElementalPrimitive.getBindsPrimitive();
-        for (Map.Entry<Integer,cElementalPrimitive> e:bindsBO.entrySet()) {
-            strings.add(String.valueOf(e.getKey().byteValue()));
-        }
-        return strings;
-    }
-
-    @Override
-    public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_give Energy Count ClassOrId (Count ClassOrId ... <)";
-    }
-
-    @Override
-    public int compareTo(Object o) {
-        if(o instanceof ICommand){
-            return getCommandName().compareTo(((ICommand) o).getCommandName());
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean canCommandSenderUseCommand(ICommandSender sender) {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java
deleted file mode 100644
index 20110c0b0d..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/ListEM.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import net.minecraft.command.ICommand;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.util.ChatComponentText;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by danie_000 on 30.12.2017.
- */
-public class ListEM implements ICommand {
-    ArrayList<String> aliases=new ArrayList<>();
-
-    public ListEM(){
-        aliases.add("em_list");
-        aliases.add("list_em");
-    }
-
-    @Override
-    public void processCommand(ICommandSender sender, String[] args) {
-        if (!sender.getEntityWorld().isRemote) {
-            if(args.length == 0) {
-                sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
-                Map<Byte,Method> binds= cElementalDefinition.getBindsComplex();
-                for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                    sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
-                }
-            }else if(args.length==1){
-                sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
-                if(args[0].equals(String.valueOf((char)cElementalPrimitive.nbtType))){
-                    Map<Integer, cElementalPrimitive> bindsBO = cElementalPrimitive.getBindsPrimitive();
-                    for (Map.Entry<Integer,cElementalPrimitive> e:bindsBO.entrySet()) {
-                        sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getName()));
-                    }
-                }else{
-                    sender.addChatMessage(new ChatComponentText("Complex definition - needs contents"));
-                }
-            }else{
-                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
-            }
-        }
-    }
-
-    @Override
-    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
-        return false;
-    }
-
-    @Override
-    public List<String> getCommandAliases() {
-        return aliases;
-    }
-
-    @Override
-    public String getCommandName() {
-        return aliases.get(0);
-    }
-
-    @Override
-    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==0){
-            Map<Byte,Method> binds= cElementalDefinition.getBindsComplex();
-            ArrayList<String> strings=new ArrayList<>(binds.size());
-            for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
-            }
-            return strings;
-        }
-        return null;
-    }
-
-    @Override
-    public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_list (optional class tag)";
-    }
-
-    @Override
-    public int compareTo(Object o) {
-        if(o instanceof ICommand){
-            return getCommandName().compareTo(((ICommand) o).getCommandName());
-        }
-        return 0;
-    }
-
-    @Override
-    public boolean canCommandSenderUseCommand(ICommandSender sender) {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
new file mode 100644
index 0000000000..bed49a5040
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
@@ -0,0 +1,90 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+
+import static com.github.technus.tectech.util.DoubleCount.mul;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMDecay {
+    public static final EMDecay[]                  NO_DECAY   = null;
+    //DECAY IMPOSSIBLE!!!
+    //Do not use regular NULL java will not make it work with varargs!!!
+    //Or cast null into ARRAY type but this static is more convenient!!!
+    public static final EMDecay[]          NO_PRODUCT = new EMDecay[0];
+    //this in turn can be used to tell that the thing should just vanish
+    private final EMConstantStackMap outputStacks;
+    private final double             probability;
+
+    public EMDecay(IEMDefinition... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public EMDecay(double probability, IEMDefinition... outSafe) {
+        EMDefinitionStack[] outArr = new EMDefinitionStack[outSafe.length];
+        for (int i = 0; i < outArr.length; i++) {
+            outArr[i] = new EMDefinitionStack(outSafe[i], 1D);
+        }
+        outputStacks = new EMConstantStackMap(outArr);
+        this.probability = probability;
+    }
+
+    public EMDecay(EMDefinitionStack... outSafe) {
+        this(1D, outSafe);
+    }
+
+    public EMDecay(double probability, EMDefinitionStack... out) {
+        outputStacks = new EMConstantStackMap(out);
+        this.probability = probability;
+    }
+
+    public EMDecay(EMConstantStackMap tree) {
+        this(1D, tree);
+    }
+
+    public EMDecay(double probability, EMConstantStackMap tree) {
+        outputStacks = tree;
+        this.probability = probability;
+    }
+
+    public EMInstanceStackMap getResults(double lifeMult, double age, long newEnergyLevel, double amountDecaying) {
+        EMInstanceStackMap decayResult = new EMInstanceStackMap();
+        if (getOutputStacks() == null) {
+            return decayResult;//This is to prevent null pointer exceptions.
+        }
+        //Deny decay code is in instance!
+        boolean empty=true;
+        for (EMDefinitionStack stack : getOutputStacks().valuesToArray()) {
+            if(stack.getAmount() >0){
+                empty=false;
+                break;
+            }
+        }
+        if (empty) {
+            return decayResult;
+        }
+        //newEnergyLevel /= qtty;
+        //lifeMult /= (float) qtty;
+        for (EMDefinitionStack stack : getOutputStacks().valuesToArray()) {
+            decayResult.putUnify(new EMInstanceStack(stack.getDefinition(),
+                    mul(amountDecaying, stack.getAmount()),
+                    lifeMult,
+                    age/*new products*/,
+                    (long)(newEnergyLevel / Math.max(1D, Math.abs(stack.getAmount())))));//get instances from stack
+        }
+        return decayResult;
+    }
+
+    public EMConstantStackMap getOutputStacks() {
+        return outputStacks;
+    }
+
+    public double getProbability() {
+        return probability;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java
new file mode 100644
index 0000000000..0a00a519f9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecayResult.java
@@ -0,0 +1,45 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+
+public class EMDecayResult {
+    private final EMInstanceStackMap output;
+    private       double massAffected;
+    private       double massDiff;
+
+    public EMDecayResult(EMInstanceStackMap output, double massAffected, double massDiff) {
+        this.output = output;
+        this.massAffected = massAffected;
+        this.massDiff = massDiff;
+    }
+
+    public EMInstanceStackMap getOutput() {
+        return output;
+    }
+
+    /**
+     * How much was lost in the process (decayed or removed)
+     *
+     * @return
+     */
+    public double getMassAffected() {
+        return massAffected;
+    }
+
+    /**
+     * Difference of mass of actually decayed elements
+     *
+     * @return
+     */
+    public double getMassDiff() {
+        return massDiff;
+    }
+
+    public void setMassAffected(double massAffected) {
+        this.massAffected = massAffected;
+    }
+
+    public void setMassDiff(double massDiff) {
+        this.massDiff = massDiff;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
deleted file mode 100644
index 79103f7fa0..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecay.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cElementalDecay {
-    public static final cElementalDecay[] noDecay = null;
-    //DECAY IMPOSSIBLE!!!
-    //Do not use regular NULL java will not make it work with varargs!!!
-    //Or cast null into ARRAY type but this static is more convenient!!!
-    public static final cElementalDecay[]          noProduct = new cElementalDecay[0];
-    //this in turn can be used to tell that the thing should just vanish
-    public final        cElementalConstantStackMap outputStacks;
-    public final        double                     probability;
-
-    public cElementalDecay(iElementalDefinition... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, iElementalDefinition... outSafe) {
-        cElementalDefinitionStack[] outArr = new cElementalDefinitionStack[outSafe.length];
-        for (int i = 0; i < outArr.length; i++) {
-            outArr[i] = new cElementalDefinitionStack(outSafe[i], 1D);
-        }
-        outputStacks = new cElementalConstantStackMap(outArr);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalDefinitionStack... outSafe) {
-        this(1D, outSafe);
-    }
-
-    public cElementalDecay(double probability, cElementalDefinitionStack... out) {
-        outputStacks = new cElementalConstantStackMap(out);
-        this.probability = probability;
-    }
-
-    public cElementalDecay(cElementalConstantStackMap tree) {
-        this(1D, tree);
-    }
-
-    public cElementalDecay(double probability, cElementalConstantStackMap tree) {
-        outputStacks = tree;
-        this.probability = probability;
-    }
-
-    public cElementalInstanceStackMap getResults(double lifeMult, double age, long energyTotalForProducts, double amountDecaying) {
-        cElementalInstanceStackMap decayResult = new cElementalInstanceStackMap();
-        if (outputStacks == null) {
-            return decayResult;//This is to prevent null pointer exceptions.
-        }
-        //Deny decay code is in instance!
-        double qtty = 0D;
-        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
-            qtty= add(qtty,stack.amount);
-        }
-        if (qtty <= 0D) {
-            return decayResult;
-        }
-        //energyTotalForProducts /= qtty;
-        //lifeMult /= (float) qtty;
-        for (cElementalDefinitionStack stack : outputStacks.valuesToArray()) {
-            decayResult.putUnify(new cElementalInstanceStack(stack.definition,
-                    amountDecaying * stack.amount,
-                    lifeMult, age/*new products*/, (long)(energyTotalForProducts / Math.max(1D, Math.abs(stack.amount)))));//get instances from stack
-        }
-        return decayResult;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
deleted file mode 100644
index 43f4341720..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/cElementalDecayResult.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.decay;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-
-public class cElementalDecayResult {
-    private final cElementalInstanceStackMap output;
-    private       double                     massAffected;
-    private       double                     massDiff;
-
-    public cElementalDecayResult(cElementalInstanceStackMap output, double massAffected, double massDiff) {
-        this.output = output;
-        this.massAffected = massAffected;
-        this.massDiff = massDiff;
-    }
-
-    public cElementalInstanceStackMap getOutput() {
-        return output;
-    }
-
-    /**
-     * How much was lost in the process (decayed or removed)
-     * @return
-     */
-    public double getMassAffected() {
-        return massAffected;
-    }
-
-    /**
-     * Difference of mass of actually decayed elements
-     * @return
-     */
-    public double getMassDiff() {
-        return massDiff;
-    }
-
-    public void setMassAffected(double massAffected) {
-        this.massAffected = massAffected;
-    }
-
-    public void setMassDiff(double massDiff) {
-        this.massDiff = massDiff;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
deleted file mode 100644
index 457a37f7b9..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/iElementalContainer.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-
-/**
- * Created by danie_000 on 25.01.2017.
- */
-public interface iElementalContainer {
-    cElementalInstanceStackMap getContentHandler();
-
-    void purgeOverflow();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
new file mode 100644
index 0000000000..d9297436a0
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
@@ -0,0 +1,58 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.Collections;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+public final class EMConstantStackMap/*IMMUTABLE*/ extends EMStackMap<EMDefinitionStack> {//Target class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public static final EMConstantStackMap EMPTY = new EMConstantStackMap();
+
+    private EMConstantStackMap() {
+        super(Collections.emptyNavigableMap());
+    }
+
+    public EMConstantStackMap(EMDefinitionStack... in) {
+        this(new EMDefinitionStackMap(in).getBackingMap());
+    }
+
+    public EMConstantStackMap(NavigableMap<IEMDefinition, EMDefinitionStack> in) {
+        super(Collections.unmodifiableNavigableMap(in));
+    }
+
+    @Override
+    public Class<EMDefinitionStack> getType() {
+        return EMDefinitionStack.class;
+    }
+
+    //IMMUTABLE DON'T NEED IT
+    @Override
+    public EMConstantStackMap clone() {
+        return this;
+    }
+
+    public EMDefinitionStackMap toMutable() {
+        return new EMDefinitionStackMap(new TreeMap<>(getBackingMap()));
+    }
+
+    public static EMConstantStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+        EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].getDefinition().equals(nbtE__)) {
+                throw new EMException("Something went Wrong");
+            }
+        }
+        return new EMConstantStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
new file mode 100644
index 0000000000..45ce50d5c7
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
@@ -0,0 +1,56 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class EMDefinitionStackMap extends EMStackMap<EMDefinitionStack> implements IEMMapWriteExact<EMDefinitionStack> {//Transient class for construction of definitions/recipes
+    //Constructors + Clone, all make a whole new OBJ.
+    public EMDefinitionStackMap() {}
+
+    public EMDefinitionStackMap(EMDefinitionStack... in) {
+        putUnifyAllExact(in);
+    }
+
+    public EMDefinitionStackMap(NavigableMap<IEMDefinition, EMDefinitionStack> in) {
+        super(in);
+    }
+
+    @Override
+    public Class<EMDefinitionStack> getType() {
+        return EMDefinitionStack.class;
+    }
+
+    @Override
+    public EMDefinitionStackMap clone() {
+        return new EMDefinitionStackMap(new TreeMap<>(getBackingMap()));
+    }
+
+    public EMConstantStackMap toImmutable() {
+        return new EMConstantStackMap(new TreeMap<>(getBackingMap()));
+    }
+
+    public EMConstantStackMap toImmutable_optimized_unsafe_LeavesExposedElementalTree() {
+        return new EMConstantStackMap(getBackingMap());
+    }
+
+    public static EMDefinitionStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+        EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < defStacks.length; i++) {
+            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (defStacks[i].getDefinition().equals(nbtE__)) {
+                throw new EMException("Something went Wrong");
+            }
+        }
+        return new EMDefinitionStackMap(defStacks);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
new file mode 100644
index 0000000000..c15142787f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -0,0 +1,242 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.util.DoubleCount.add;
+
+/**
+ * Created by danie_000 on 22.01.2017.
+ */
+public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implements IEMMapWrite<EMInstanceStack> {
+    //Constructors
+    public EMInstanceStackMap() {}
+
+    public EMInstanceStackMap(EMInstanceStack... inSafe) {
+        this(true, inSafe);
+    }
+
+    public EMInstanceStackMap(boolean clone, EMInstanceStack... in) {
+        if (clone) {
+            EMInstanceStack[] stacks =new EMInstanceStack[in.length];
+            for(int i=0;i<stacks.length;i++) {
+                stacks[i] = in[i].clone();
+            }
+            putUnifyAll(stacks);
+        } else {
+            putUnifyAll(in);
+        }
+    }
+
+    private EMInstanceStackMap(NavigableMap<IEMDefinition, EMInstanceStack> inSafe) {
+        this(true, inSafe);
+    }
+
+    private EMInstanceStackMap(boolean clone, NavigableMap<IEMDefinition, EMInstanceStack> in) {
+        super(clone?new TreeMap<>():in);
+        if (clone) {
+            for(EMInstanceStack stack:in.values()) {
+                putUnify(stack.clone());
+            }
+        }
+    }
+
+    @Override
+    public Class<EMInstanceStack> getType() {
+        return EMInstanceStack.class;
+    }
+
+    @Override
+    public EMInstanceStackMap clone() {
+        return new EMInstanceStackMap(getBackingMap());
+    }
+
+    //Remove overflow
+    public double removeOverflow(int stacksCount, double stackCapacity) {
+        double massRemoved = 0;
+
+        if (getBackingMap().size() > stacksCount) {
+            IEMDefinition[] keys = keySetToArray();
+            for (int i = stacksCount; i < keys.length; i++) {
+                massRemoved += getBackingMap().get(keys[i]).getDefinitionStack().getMass();
+                getBackingMap().remove(keys[i]);
+            }
+        }
+
+        for (EMInstanceStack instance : valuesToArray()) {
+            if (instance.getAmount() > stackCapacity) {
+                massRemoved += instance.getDefinition().getMass() * (instance.getAmount() - stackCapacity);
+                instance.setAmount(stackCapacity);
+            }
+        }
+        return massRemoved;
+    }
+
+    //Getters
+    public String[] getElementalInfo() {
+        String[] info = new String[getBackingMap().size()];
+        int i = 0;
+        for (EMInstanceStack instance : getBackingMap().values()) {
+            info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName()+
+                    " "+ EnumChatFormatting.AQUA + instance.getDefinition().getSymbol()+ EnumChatFormatting.RESET+
+                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E", instance.getAmount() / AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
+                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
+                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
+        }
+        return info;
+    }
+
+    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<IEMDefinition, EMInstanceStack> e: getBackingMap().entrySet()){
+            e.getValue().addScanShortSymbols(list,capabilities);
+        }
+        return list;
+    }
+
+    public ArrayList<String> getScanInfo(int[] capabilities) {
+        ArrayList<String> list=new ArrayList<>(16);
+        for(Map.Entry<IEMDefinition, EMInstanceStack> e: getBackingMap().entrySet()){
+            e.getValue().addScanResults(list,capabilities);
+        }
+        return list;
+    }
+
+    //Tick Content
+    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
+        return tickContent(lifeTimeMult,postEnergize,1D);
+    }
+
+    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
+        cleanUp();
+        double diff=0;
+        for (EMInstanceStack instance : valuesToArray()) {
+            instance.setAge(instance.getAge() + seconds);
+            EMDecayResult newInstances = instance.decay(lifeTimeMult, instance.getAge(), postEnergize);
+            if (newInstances == null) {
+                instance.nextColor();
+            } else {
+                diff=add(diff,newInstances.getMassDiff());
+                removeAmount(instance);//todo check maybe this should be removeKey
+                putUnifyAll(newInstances.getOutput());
+            }
+        }
+        return diff;
+    }
+
+    //NBT
+    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanShortSymbols(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        ArrayList<String> info = getScanInfo(capabilities);
+        nbt.setInteger("i", info.size());
+        for (int i = 0; i < info.size(); i++) {
+            nbt.setString(Integer.toString(i), info.get(i));
+        }
+        return nbt;
+    }
+
+    public static EMInstanceStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+        EMInstanceStack[] instances = new EMInstanceStack[nbt.getInteger("i")];
+        for (int i = 0; i < instances.length; i++) {
+            instances[i] = EMInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            if (instances[i].getDefinition().equals(nbtE__)) {
+                throw new EMException("Something went Wrong");
+            }
+        }
+        return new EMInstanceStackMap(false, instances);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EMInstanceStackMap) {
+            return compareTo((EMInstanceStackMap) obj) == 0;
+        }
+        if (obj instanceof EMStackMap) {
+            return toDefinitionMapForComparison().compareTo((EMStackMap<?>) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder build=new StringBuilder("Instance Stack Map\n");
+        for(EMInstanceStack stack: getBackingMap().values()){
+            build.append(stack.toString()).append('\n');
+        }
+        return build.toString();
+    }
+
+    public EMInstanceStackMap takeAll(){
+        EMInstanceStackMap newStack =new EMInstanceStackMap(false,new TreeMap<>(this.getBackingMap()));//just in case to uncouple The map
+        this.getBackingMap().clear();
+        return newStack;
+    }
+
+    public EMDefinitionStackMap toDefinitionMapForComparison() {
+        EMDefinitionStack[] list = new EMDefinitionStack[size()];
+        int                 i    = 0;
+        for (Map.Entry<IEMDefinition, EMInstanceStack> entry : entrySet()) {
+            EMInstanceStack value = entry.getValue();
+            list[i++] = new EMDefinitionStack(value.getDefinition(), value.getAmount());
+        }
+        return new EMDefinitionStackMap(list);
+    }
+
+    @Override
+    public EMInstanceStack putUnify(EMInstanceStack stack) {
+        EMInstanceStack target =get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = add(target.getAmount(), stack.getAmount());
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=target.unifyIntoThis(stack);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+
+    @Override
+    public EMInstanceStack putUnifyExact(EMInstanceStack stack) {
+        EMInstanceStack target =get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = target.getAmount()+stack.getAmount();
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=target.unifyIntoThis(stack);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
new file mode 100644
index 0000000000..4c798499b5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
@@ -0,0 +1,50 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+/**
+ * Created by Tec on 12.05.2017.
+ */
+abstract class EMStackMap<T extends IEMStack> implements IEMMapRead<T> {
+    private final NavigableMap<IEMDefinition, T> backingMap;
+
+    protected EMStackMap() {
+        this(new TreeMap<>());
+    }
+
+    protected EMStackMap(NavigableMap<IEMDefinition, T> map) {
+        this.backingMap =map;
+    }
+
+    @Override
+    public NavigableMap<IEMDefinition, T> getBackingMap() {
+        return backingMap;
+    }
+
+    @Override
+    public abstract EMStackMap<T> clone();
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EMInstanceStackMap) {
+            return compareTo(((EMInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
+        }
+        if (obj instanceof EMStackMap) {
+            return compareTo((EMStackMap) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Hash only definitions to compare contents not amounts or data
+        int hash = -(getBackingMap().size() << 4);
+        for (T stack : getBackingMap().values()) {
+            hash += stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
new file mode 100644
index 0000000000..392d06f5cf
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
@@ -0,0 +1,275 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.lang.reflect.Array;
+import java.util.*;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
+import static com.github.technus.tectech.util.DoubleCount.ulpSigned;
+
+public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>>, Cloneable {
+    static boolean isValidAmount(double amount){
+        return amount>=AVOGADRO_CONSTANT_UNCERTAINTY;
+    }
+
+    static boolean isInvalidAmount(double amount){
+        return amount<AVOGADRO_CONSTANT_UNCERTAINTY;
+    }
+
+    NavigableMap<IEMDefinition,T> getBackingMap();
+
+    IEMMapRead<T> clone();
+
+    default Set<Map.Entry<IEMDefinition, T>> entrySet(){
+        return getBackingMap().entrySet();
+    }
+
+    default Set<IEMDefinition> keySet(){
+        return getBackingMap().keySet();
+    }
+
+    default IEMDefinition[] keySetToArray() {
+        return keySetToArray(new IEMDefinition[size()]);
+    }
+
+    default IEMDefinition[] keySetToArray(IEMDefinition[] array) {
+        return keySet().toArray(array);
+    }
+
+    default Collection<T> values(){
+        return getBackingMap().values();
+    }
+
+    @SuppressWarnings("unchecked")
+    default T[] valuesToArray(){
+        return valuesToArray((T[]) Array.newInstance(getType(),size()));
+    }
+
+    default T[] valuesToArray(T[] array){
+        return values().toArray(array);
+    }
+
+    Class<T> getType();
+
+    //Getters
+    default T getFirst(){
+        return getBackingMap().firstEntry().getValue();
+    }
+
+    default T getLast(){
+        return getBackingMap().lastEntry().getValue();
+    }
+
+    default T get(IEMStack stack) {
+        return get(stack.getDefinition());
+    }
+
+    default T get(IEMDefinition def) {
+        return getBackingMap().get(def);
+    }
+
+    default T getNaturallySorted(int pos) {
+        if(pos<0 || pos>=size()){
+            throw new IndexOutOfBoundsException("Index was: "+pos+" size was: "+size());
+        }
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            if(pos==0){
+                return entry.getValue();
+            }
+            pos--;
+        }
+        return null;
+    }
+
+    default T getRandom() {
+        return getNaturallySorted(TecTech.RANDOM.nextInt(size()));
+    }
+
+    default String[] getShortSymbolsInfo() {
+        String[] info = new String[size()];
+        int i = 0;
+        for (T instance : values()) {
+            info[i++] = instance.getDefinition().getShortSymbol();
+        }
+        return info;
+    }
+
+    default String[] getElementalInfo() {
+        String[] info = new String[size() * 3];
+        int i = 0;
+        for (T defStack : values()) {
+            info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getLocalizedName();
+            info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
+            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
+            i += 3;
+        }
+        return info;
+    }
+
+    //NBT
+    default NBTTagCompound getShortSymbolsNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getShortSymbolsInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound getInfoNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        String[] info = getElementalInfo();
+        nbt.setInteger("i", info.length);
+        for (int i = 0; i < info.length; i++) {
+            nbt.setString(Integer.toString(i), info[i]);
+        }
+        return nbt;
+    }
+
+    default NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setInteger("i", size());
+        int i = 0;
+        for (T stack : values()) {
+            nbt.setTag(Integer.toString(i++), stack.toNBT());
+        }
+        return nbt;
+    }
+
+    @Override
+    default int compareTo(IEMMapRead<? extends IEMStack> o) {//this actually compares rest
+        int sizeDiff = size() - o.size();
+        if (sizeDiff != 0) {
+            return sizeDiff;
+        }
+
+        Iterator<T>                  iterator  = values().iterator();
+        Iterator<? extends IEMStack> iteratorO = o.values().iterator();
+
+        while (iterator.hasNext()) {
+            int result = iterator.next().compareTo(iteratorO.next());
+            if (result != 0) {
+                return result;
+            }
+        }
+        return 0;
+    }
+
+    default double getMass(){
+        double mass=0;
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            mass+=entry.getValue().getMass();
+        }
+        return mass;
+    }
+
+    default long getCharge(){
+        long charge=0;
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            charge+=entry.getValue().getCharge();
+        }
+        return charge;
+    }
+
+    //Tests
+    default boolean containsKey(IEMDefinition def) {
+        return getBackingMap().containsKey(def);
+    }
+
+    default boolean containsKey(IEMStack def) {
+        return containsKey(def.getDefinition());
+    }
+
+    default boolean containsAllKeys(IEMDefinition... definitions) {
+        for (IEMDefinition def : definitions) {
+            if (!containsKey(def)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAllKeys(IEMStack... hasElementalDefinition) {
+        for (IEMStack has : hasElementalDefinition) {
+            if (!containsKey(has)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAmountExact(IEMDefinition def, double amount) {
+        T target = getBackingMap().get(def);
+        return target != null && target.getAmount() >= amount;
+    }
+
+    default boolean containsAmountExact(IEMStack stack) {
+        return containsAmountExact(stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean containsAllAmountsExact(IEMStack... stacks) {
+        for (IEMStack stack : stacks) {
+            if(!containsAmountExact(stack)){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAllAmountsExact(IEMMapRead<? extends IEMStack> container) {
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : container.entrySet()) {
+            if(!containsAmountExact(entry.getValue())){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAmount(IEMDefinition def, double amountToConsume) {
+        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        if(amountRequired==amountToConsume){
+            amountRequired-=ulpSigned(amountRequired);
+        }
+        return containsAmountExact(def,amountRequired);
+    }
+
+    default boolean containsAmount(IEMStack stack) {
+        return containsAmount(stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean containsAllAmounts(IEMStack... stacks) {
+        for (IEMStack stack : stacks) {
+            if(!containsAmount(stack)){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default boolean containsAllAmounts(IEMMapRead<? extends IEMStack> container) {
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : container.entrySet()) {
+            if(!containsAmount(entry.getValue())){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    default int size() {
+        return getBackingMap().size();
+    }
+
+    default boolean hasStacks() {
+        return !isEmpty();
+    }
+
+    default boolean isEmpty(){
+        return getBackingMap().isEmpty();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
new file mode 100644
index 0000000000..cc22267474
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
@@ -0,0 +1,112 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+
+import java.util.Map;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_EPSILON;
+import static com.github.technus.tectech.util.DoubleCount.*;
+
+public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
+    IEMMapWrite<T> clone();
+
+    /**
+     * Consumes amount from map
+     * @param def def to consume
+     * @param amountToConsume should be comparable to {@link EMTransformationInfo#AVOGADRO_CONSTANT}
+     * @return consumed successfully
+     */
+    default boolean removeAmount(IEMDefinition def, double amountToConsume){
+        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        if(amountRequired==amountToConsume){
+            amountRequired-=ulpSigned(amountRequired);
+        }
+        return removeAmount(def,amountToConsume,amountRequired);
+    }
+
+    default boolean removeAmount(IEMDefinition def, double amountToConsume, double amountRequired){
+        T current=getBackingMap().get(def);
+        if(current!=null){
+            if(current.getAmount()>=amountRequired){
+                double newAmount=sub(current.getAmount(),amountToConsume);
+                if(IEMMapRead.isValidAmount(current.getAmount())){
+                    current=(T)current.mutateAmount(newAmount);
+                    getBackingMap().put(current.getDefinition(),current);
+                }else {
+                    getBackingMap().remove(current.getDefinition());
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    default boolean removeAmount(IEMStack stack) {
+        return removeAmount(stack.getDefinition(),stack.getAmount());
+    }
+
+    default boolean removeAllAmounts(IEMStack... stacks) {
+        boolean test = true;
+        for (IEMStack stack : stacks) {
+            test &= containsAmount(stack);
+        }
+        if (!test) {
+            return test;
+        }
+        for (IEMStack stack : stacks) {
+            removeAmount(stack);
+        }
+        return true;
+    }
+
+    default boolean removeAllAmounts(IEMMapRead<? extends IEMStack> map) {
+        boolean test=true;
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            test &= containsAmount(entry.getValue());
+        }
+        if (!test) {
+            return test;
+        }
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            removeAmount(entry.getValue());
+        }
+        return true;
+    }
+
+    //Put unify
+    /**
+     *
+     * @param stack thing to put
+     * @return new mapping or null if merging actually removed stuff
+     */
+    default T putUnify(T stack) {
+        T target=getBackingMap().get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = add(target.getAmount(), stack.getAmount());
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=(T) target.mutateAmount(newAmount);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+
+    default void putUnifyAll(T... defs) {
+        for (T def : defs) {
+            putUnify(def);
+        }
+    }
+
+    default void putUnifyAll(IEMMapRead<T> inTreeUnsafe) {
+        for (T in : inTreeUnsafe.values()) {
+            putUnify(in);
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
new file mode 100644
index 0000000000..7b8853a2f4
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
@@ -0,0 +1,166 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+
+import java.util.Map;
+
+public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
+    default void cleanUp(){
+        entrySet().removeIf(entry -> IEMMapRead.isInvalidAmount(entry.getValue().getAmount()));
+    }
+
+    default void clear() {
+        getBackingMap().clear();
+    }
+
+    IEMMapWriteExact<T> clone();
+
+    //Remove
+    default T removeKey(IEMDefinition def) {
+        return getBackingMap().remove(def);
+    }
+
+    default T removeKey(IEMStack has) {
+        return removeKey(has.getDefinition());
+    }
+
+    default boolean removeKeys(IEMDefinition... definitions) {
+        boolean hadAll=true;
+        for (IEMDefinition def : definitions) {
+            hadAll&=removeKey(def)!=null;
+        }
+        return hadAll;
+    }
+
+    default boolean removeKeys(IEMStack... hasElementalDefinition) {
+        boolean hadAll=true;
+        for (IEMStack has : hasElementalDefinition) {
+            hadAll&=removeKey(has)!=null;
+        }
+        return hadAll;
+    }
+
+    default boolean removeAllKeys(IEMDefinition... definitions) {
+        boolean hadAll=containsAllKeys(definitions);
+        if(hadAll){
+            for (IEMDefinition def : definitions) {
+                removeKey(def);
+            }
+        }
+        return hadAll;
+    }
+
+    default boolean removeAllKeys(IEMStack... hasElementalDefinition) {
+        boolean hadAll=containsAllKeys(hasElementalDefinition);
+        if(hadAll){
+            for (IEMStack stack : hasElementalDefinition) {
+                removeKey(stack);
+            }
+        }
+        return hadAll;
+    }
+
+    default void putReplace(T defStackUnsafe) {
+        getBackingMap().put(defStackUnsafe.getDefinition(), defStackUnsafe);
+    }
+
+    default void putReplaceAll(T... defStacksUnsafe) {
+        for (T defStack : defStacksUnsafe) {
+            putReplace(defStack);
+        }
+    }
+
+    default void putReplaceAll(IEMMapRead<T> inContainerUnsafe) {
+        getBackingMap().putAll(inContainerUnsafe.getBackingMap());
+    }
+
+    /**
+     * Should only be used when modifying definitions to alter the integer count correctly
+     * @param def
+     * @return
+     */
+    default boolean removeAmountExact(IEMStack def){
+        return removeAmountExact(def.getDefinition(),def.getAmount());
+    }
+
+    /**
+     * Should only be used when modifying definitions to alter the integer count correctly
+     * @param def
+     * @param amountToConsume
+     * @return
+     */
+    default boolean removeAmountExact(IEMDefinition def, double amountToConsume){
+        T current=getBackingMap().get(def);
+        if(current!=null){
+            double newAmount=current.getAmount()-amountToConsume;
+            if(newAmount>=0){
+                if(IEMMapRead.isValidAmount(current.getAmount())){
+                    current=(T)current.mutateAmount(newAmount);
+                    getBackingMap().put(current.getDefinition(),current);
+                } else {
+                    getBackingMap().remove(current.getDefinition());
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    default boolean removeAllAmountsExact(IEMStack... stacks) {
+        boolean test = true;
+        for (IEMStack stack : stacks) {
+            test &= containsAmountExact(stack);
+        }
+        if (!test) {
+            return test;
+        }
+        for (IEMStack stack : stacks) {
+            removeAmountExact(stack);
+        }
+        return true;
+    }
+
+    default boolean removeAllAmountsExact(IEMMapRead<? extends IEMStack> map) {
+        boolean test=true;
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            test &= containsAmountExact(entry.getValue());
+        }
+        if (!test) {
+            return test;
+        }
+        for (Map.Entry<IEMDefinition, ? extends IEMStack> entry : map.entrySet()) {
+            removeAmountExact(entry.getValue());
+        }
+        return true;
+    }
+
+    default T putUnifyExact(T stack) {
+        T target=getBackingMap().get(stack.getDefinition());
+        if(target==null) {
+            putReplace(stack);
+            return stack;
+        }
+        double newAmount = target.getAmount()+stack.getAmount();
+        if (IEMMapRead.isValidAmount(newAmount)) {
+            stack=(T) target.mutateAmount(newAmount);
+            putReplace(stack);
+            return stack;
+        }else {
+            removeKey(stack);
+            return null;
+        }
+    }
+
+    default void putUnifyAllExact(T... defs) {
+        for (T def : defs) {
+            putUnifyExact(def);
+        }
+    }
+
+    default void putUnifyAllExact(IEMMapRead<T> inTreeUnsafe) {
+        for (T in : inTreeUnsafe.values()) {
+            putUnifyExact(in);
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
deleted file mode 100644
index cde1d55561..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalConstantStackMap.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.Collections;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-public final class cElementalConstantStackMap/*IMMUTABLE*/ extends cElementalStackMap<cElementalDefinitionStack> {//Target class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public static final cElementalConstantStackMap EMPTY = new cElementalConstantStackMap();
-
-    private cElementalConstantStackMap() {
-        super(Collections.emptyNavigableMap());
-    }
-
-    public cElementalConstantStackMap(cElementalDefinitionStack... in) {
-        this(new cElementalDefinitionStackMap(in).map);
-    }
-
-    public cElementalConstantStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        super(Collections.unmodifiableNavigableMap(in));
-    }
-
-    @Override
-    public Class<cElementalDefinitionStack> getType() {
-        return cElementalDefinitionStack.class;
-    }
-
-    //IMMUTABLE DON'T NEED IT
-    @Override
-    public cElementalConstantStackMap clone() {
-        return this;
-    }
-
-    public cElementalDefinitionStackMap toMutable() {
-        return new cElementalDefinitionStackMap(new TreeMap<>(map));
-    }
-
-    public static cElementalConstantStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalConstantStackMap(defStacks);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
deleted file mode 100644
index 1273119bb3..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalDefinitionStackMap.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalDefinitionStackMap extends cElementalStackMap<cElementalDefinitionStack> implements iElementalMapRW<cElementalDefinitionStack> {//Transient class for construction of definitions/recipes
-    //Constructors + Clone, all make a whole new OBJ.
-    public cElementalDefinitionStackMap() {}
-
-    public cElementalDefinitionStackMap(cElementalDefinitionStack... in) {
-        putUnifyAll(in);
-    }
-
-    public cElementalDefinitionStackMap(NavigableMap<iElementalDefinition, cElementalDefinitionStack> in) {
-        super(in);
-    }
-
-    @Override
-    public Class<cElementalDefinitionStack> getType() {
-        return cElementalDefinitionStack.class;
-    }
-
-    @Override
-    public cElementalDefinitionStackMap clone() {
-        return new cElementalDefinitionStackMap(new TreeMap<>(map));
-    }
-
-    public cElementalConstantStackMap toImmutable() {
-        return new cElementalConstantStackMap(new TreeMap<>(map));
-    }
-
-    public cElementalConstantStackMap toImmutable_optimized_unsafe_LeavesExposedElementalTree() {
-        return new cElementalConstantStackMap(map);
-    }
-
-    public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (defStacks[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalDefinitionStackMap(defStacks);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
deleted file mode 100644
index aab1f93990..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalInstanceStackMap.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.util.DoubleCount.add;
-
-/**
- * Created by danie_000 on 22.01.2017.
- */
-public final class cElementalInstanceStackMap extends cElementalStackMap<cElementalInstanceStack> implements iElementalMapRW<cElementalInstanceStack> {
-    //Constructors
-    public cElementalInstanceStackMap() {}
-
-    public cElementalInstanceStackMap(cElementalInstanceStack... inSafe) {
-        this(true, inSafe);
-    }
-
-    public cElementalInstanceStackMap(boolean clone, cElementalInstanceStack... in) {
-        if (clone) {
-            cElementalInstanceStack[] stacks=new cElementalInstanceStack[in.length];
-            for(int i=0;i<stacks.length;i++) {
-                stacks[i] = in[i].clone();
-            }
-            putUnifyAll(stacks);
-        } else {
-            putUnifyAll(in);
-        }
-    }
-
-    private cElementalInstanceStackMap(NavigableMap<iElementalDefinition, cElementalInstanceStack> inSafe) {
-        this(true, inSafe);
-    }
-
-    private cElementalInstanceStackMap(boolean clone, NavigableMap<iElementalDefinition, cElementalInstanceStack> in) {
-        if (clone) {
-            map = new TreeMap<>();
-            for(cElementalInstanceStack stack:in.values()) {
-                putUnify(stack.clone());
-            }
-        } else {
-            map = in;
-        }
-    }
-
-    @Override
-    public Class<cElementalInstanceStack> getType() {
-        return cElementalInstanceStack.class;
-    }
-
-    @Override
-    public cElementalInstanceStackMap clone() {
-        return new cElementalInstanceStackMap(map);
-    }
-
-    //Remove overflow
-    public double removeOverflow(int stacksCount, double stackCapacity) {
-        double massRemoved = 0;
-
-        if (map.size() > stacksCount) {
-            iElementalDefinition[] keys = keySetToArray();
-            for (int i = stacksCount; i < keys.length; i++) {
-                massRemoved += map.get(keys[i]).getDefinitionStack().getMass();
-                map.remove(keys[i]);
-            }
-        }
-
-        for (cElementalInstanceStack instance : valuesToArray()) {
-            if (instance.amount > stackCapacity) {
-                massRemoved += instance.definition.getMass() * (instance.amount - stackCapacity);
-                instance.amount = stackCapacity;
-            }
-        }
-        return massRemoved;
-    }
-
-    //Getters
-    public String[] getElementalInfo() {
-        String[] info = new String[map.size()];
-        int i = 0;
-        for (cElementalInstanceStack instance : map.values()) {
-            info[i++] = EnumChatFormatting.BLUE + instance.definition.getName()+
-                    " "+ EnumChatFormatting.AQUA + instance.definition.getSymbol()+ EnumChatFormatting.RESET+
-                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E",instance.amount/ AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
-                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
-                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
-        }
-        return info;
-    }
-
-    public ArrayList<String> getScanShortSymbols(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanShortSymbols(list,capabilities);
-        }
-        return list;
-    }
-
-    public ArrayList<String> getScanInfo(int[] capabilities) {
-        ArrayList<String> list=new ArrayList<>(16);
-        for(Map.Entry<iElementalDefinition,cElementalInstanceStack> e:map.entrySet()){
-            e.getValue().addScanResults(list,capabilities);
-        }
-        return list;
-    }
-
-    //Tick Content
-    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
-        return tickContent(lifeTimeMult,postEnergize,1D);
-    }
-
-    public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
-        cleanUp();
-        double diff=0;
-        for (cElementalInstanceStack instance : valuesToArray()) {
-            cElementalDecayResult newInstances = instance.decay(lifeTimeMult, instance.age += seconds, postEnergize);
-            if (newInstances == null) {
-                instance.nextColor();
-            } else {
-                diff=add(diff,newInstances.getMassDiff());
-                removeAmount(false,instance);
-                putUnifyAll(newInstances.getOutput());
-            }
-        }
-        return diff;
-    }
-
-    //NBT
-    public NBTTagCompound getScanShortSymbolsNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanShortSymbols(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public NBTTagCompound getScanInfoNBT(int[] capabilities) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        ArrayList<String> info = getScanInfo(capabilities);
-        nbt.setInteger("i", info.size());
-        for (int i = 0; i < info.size(); i++) {
-            nbt.setString(Integer.toString(i), info.get(i));
-        }
-        return nbt;
-    }
-
-    public static cElementalInstanceStackMap fromNBT(NBTTagCompound nbt) throws tElementalException {
-        cElementalInstanceStack[] instances = new cElementalInstanceStack[nbt.getInteger("i")];
-        for (int i = 0; i < instances.length; i++) {
-            instances[i] = cElementalInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-            if (instances[i].definition.equals(nbtE__)) {
-                throw new tElementalException("Something went Wrong");
-            }
-        }
-        return new cElementalInstanceStackMap(false, instances);
-    }
-
-    //stackUp
-    public static cElementalInstanceStack[] stackUp(cElementalInstanceStack... in) {
-        cElementalInstanceStackMap inTree = new cElementalInstanceStackMap();
-        inTree.putUnifyAll(in);
-        return inTree.valuesToArray();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo((cElementalInstanceStackMap) obj) == 0;
-        }
-        if (obj instanceof cElementalStackMap) {
-            return toDefinitionMapForComparison().compareTo((cElementalStackMap) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder build=new StringBuilder("Instance Stack Map\n");
-        for(cElementalInstanceStack stack:map.values()){
-            build.append(stack.toString()).append('\n');
-        }
-        return build.toString();
-    }
-
-    public cElementalInstanceStackMap takeAll(){
-        cElementalInstanceStackMap newStack=new cElementalInstanceStackMap(false,new TreeMap<>(this.map));//just in case to uncouple The map
-        this.map.clear();
-        return newStack;
-    }
-
-    public cElementalDefinitionStackMap toDefinitionMapForComparison() {
-        cElementalDefinitionStack[] list = new cElementalDefinitionStack[size()];
-        int                         i    = 0;
-        for (Map.Entry<iElementalDefinition, cElementalInstanceStack> entry : entrySet()) {
-            cElementalInstanceStack value = entry.getValue();
-            list[i++] = new cElementalDefinitionStack(value.getDefinition(), value.getAmount());
-        }
-        return new cElementalDefinitionStackMap(list);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
deleted file mode 100644
index 2b144df128..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/cElementalStackMap.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import java.util.NavigableMap;
-import java.util.TreeMap;
-
-/**
- * Created by Tec on 12.05.2017.
- */
-abstract class cElementalStackMap<T extends iElementalStack> implements iElementalMapR<T> {
-    protected NavigableMap<iElementalDefinition, T> map;
-
-    protected cElementalStackMap() {
-        this(new TreeMap<>());
-    }
-
-    protected cElementalStackMap(NavigableMap<iElementalDefinition, T> map) {
-        this.map = map;
-    }
-
-    @Override
-    public NavigableMap<iElementalDefinition, T> getBackingMap() {
-        return map;
-    }
-
-    @Override
-    public abstract cElementalStackMap<T> clone();
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof cElementalInstanceStackMap) {
-            return compareTo(((cElementalInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
-        }
-        if (obj instanceof cElementalStackMap) {
-            return compareTo((cElementalStackMap) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Hash only definitions to compare contents not amounts or data
-        int hash = -(map.size() << 4);
-        for (T stack : map.values()) {
-            hash += stack.getDefinition().hashCode();
-        }
-        return hash;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
deleted file mode 100644
index 0491c43ebc..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapR.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-
-import java.lang.reflect.Array;
-import java.util.*;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-
-public interface iElementalMapR<T extends iElementalStack> extends Comparable<iElementalMapR<? extends iElementalStack>>, Cloneable {
-    NavigableMap<iElementalDefinition,T> getBackingMap();
-
-    iElementalMapR<T> clone();
-
-    default Set<Map.Entry<iElementalDefinition, T>> entrySet(){
-        return getBackingMap().entrySet();
-    }
-
-    default Set<iElementalDefinition> keySet(){
-        return getBackingMap().keySet();
-    }
-
-    default iElementalDefinition[] keySetToArray() {
-        return keySetToArray(new iElementalDefinition[size()]);
-    }
-
-    default iElementalDefinition[] keySetToArray(iElementalDefinition[] array) {
-        return getBackingMap().keySet().toArray(array);
-    }
-
-    default Collection<T> values(){
-        return getBackingMap().values();
-    }
-
-    @SuppressWarnings("unchecked")
-    default T[] valuesToArray(){
-        return valuesToArray((T[]) Array.newInstance(getType(),size()));
-    }
-
-    default T[] valuesToArray(T[] array){
-        return getBackingMap().values().toArray(array);
-    }
-
-    Class<T> getType();
-
-    //Getters
-    default T getFirst(){
-        return getBackingMap().firstEntry().getValue();
-    }
-
-    default T getLast(){
-        return getBackingMap().lastEntry().getValue();
-    }
-
-    default T get(iElementalDefinition def) {
-        return getBackingMap().get(def);
-    }
-
-    default T getNaturallySorted(int pos) {
-        if(pos<0 || pos>=size()){
-            throw new IndexOutOfBoundsException("Index was: "+pos+" size was: "+size());
-        }
-        for (Map.Entry<iElementalDefinition, T> entry : entrySet()) {
-            if(pos==0){
-                return entry.getValue();
-            }
-            pos--;
-        }
-        return null;
-    }
-
-    default T getRandom() {
-        return getNaturallySorted(TecTech.RANDOM.nextInt(size()));
-    }
-
-    default String[] getShortSymbolsInfo() {
-        String[] info = new String[size()];
-        int i = 0;
-        for (T instance : values()) {
-            info[i++] = instance.getDefinition().getShortSymbol();
-        }
-        return info;
-    }
-
-    default String[] getElementalInfo() {
-        String[] info = new String[size() * 3];
-        int i = 0;
-        for (T defStack : values()) {
-            info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getName();
-            info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
-            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
-            i += 3;
-        }
-        return info;
-    }
-
-    //NBT
-    default NBTTagCompound getShortSymbolsNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getShortSymbolsInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    default NBTTagCompound getInfoNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        String[] info = getElementalInfo();
-        nbt.setInteger("i", info.length);
-        for (int i = 0; i < info.length; i++) {
-            nbt.setString(Integer.toString(i), info[i]);
-        }
-        return nbt;
-    }
-
-    default NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger("i", size());
-        int i = 0;
-        for (T stack : values()) {
-            nbt.setTag(Integer.toString(i++), stack.toNBT());
-        }
-        return nbt;
-    }
-
-    @Override
-    default int compareTo(iElementalMapR<? extends iElementalStack> o) {//this actually compares rest
-        int sizeDiff = size() - o.size();
-        if (sizeDiff != 0) {
-            return sizeDiff;
-        }
-
-        Iterator<T> iterator = values().iterator();
-        Iterator<? extends iElementalStack> iteratorO = o.values().iterator();
-
-        while (iterator.hasNext()) {
-            int result = iterator.next().compareTo(iteratorO.next());
-            if (result != 0) {
-                return result;
-            }
-        }
-        return 0;
-    }
-
-    default double getMass(){
-        double mass=0;
-        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
-            mass+=entry.getValue().getMass();
-        }
-        return mass;
-    }
-
-    default long getCharge(){
-        long charge=0;
-        for (Map.Entry<iElementalDefinition, T> entry : getBackingMap().entrySet()) {
-            charge+=entry.getValue().getCharge();
-        }
-        return charge;
-    }
-
-    //Tests
-    default boolean containsKey(iElementalDefinition def) {
-        return getBackingMap().containsKey(def);
-    }
-
-    default boolean containsKey(iElementalStack def) {
-        return containsKey(def.getDefinition());
-    }
-
-    default int size() {
-        return getBackingMap().size();
-    }
-
-    default boolean hasStacks() {
-        return !isEmpty();
-    }
-
-    default boolean isEmpty(){
-        return getBackingMap().isEmpty();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
deleted file mode 100644
index 7f8d314858..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/iElementalMapRW.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-
-import java.util.Map;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
-import static com.github.technus.tectech.util.DoubleCount.sub;
-
-public interface iElementalMapRW<T extends iElementalStack> extends iElementalMapR<T> {
-    iElementalMapRW<T> clone();
-
-    default void cleanUp(){
-        getBackingMap().entrySet().removeIf(entry -> entry.getValue().getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY);
-    }
-
-    default void clear() {
-        getBackingMap().clear();
-    }
-
-    //Remove
-    default T remove(iElementalDefinition def) {
-        return getBackingMap().remove(def);
-    }
-
-    default T remove(iElementalStack has) {
-        return remove(has.getDefinition());
-    }
-
-    default void removeAll(iElementalDefinition... definitions) {
-        for (iElementalDefinition def : definitions) {
-            getBackingMap().remove(def);
-        }
-    }
-
-    default void removeAll(iElementalStack... hasElementalDefinition) {
-        for (iElementalStack has : hasElementalDefinition) {
-            getBackingMap().remove(has.getDefinition());
-        }
-    }
-
-    default boolean removeAmount(boolean testOnly, iElementalStack stack) {
-        return removeAmount(testOnly,stack.getDefinition(),stack.getAmount());
-    }
-
-    default boolean removeAmount(boolean testOnly, iElementalDefinition def,double amount) {
-        T target = getBackingMap().get(def);
-        if (target == null) {
-            return false;
-        }
-        if (testOnly) {
-            return target.getAmount() >= amount;
-        } else {
-            double newAmount = sub(target.getAmount(),amount);
-            if (newAmount > 0) {
-                getBackingMap().put(target.getDefinition(), (T)target.mutateAmount(newAmount));
-                return true;
-            } else if (newAmount == 0) {
-                getBackingMap().remove(def);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    default boolean removeAllAmounts(boolean testOnly, iElementalStack... stacks) {
-        boolean test = true;
-        for (iElementalStack stack : stacks) {
-            test &= removeAmount(true, stack);
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (iElementalStack stack : stacks) {
-            removeAmount(false, stack);
-        }
-        return true;
-    }
-
-    default boolean removeAllAmounts(boolean testOnly, iElementalMapR<? extends iElementalStack> container) {
-        boolean test=true;
-        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
-            test &= removeAmount(true, entry.getValue());
-        }
-        if (testOnly || !test) {
-            return test;
-        }
-        for (Map.Entry<iElementalDefinition, ? extends iElementalStack> entry : container.entrySet()) {
-            removeAmount(false, entry.getValue());
-        }
-        return true;
-    }
-
-    //Put replace
-    default T putReplace(T defStackUnsafe) {
-        return getBackingMap().put(defStackUnsafe.getDefinition(), defStackUnsafe);
-    }
-
-    default void putReplaceAll(T... defStacks) {
-        for (T defStack : defStacks) {
-            getBackingMap().put(defStack.getDefinition(), defStack);
-        }
-    }
-
-    default void putReplaceAll(iElementalMapR<T> inContainerUnsafe) {
-        getBackingMap().putAll(inContainerUnsafe.getBackingMap());
-    }
-
-    //Put unify
-    default T putUnify(T def) {
-        T stack=getBackingMap().get(def.getDefinition());
-        if(stack==null) {
-            return getBackingMap().put(def.getDefinition(), def);
-        }
-        return getBackingMap().put(def.getDefinition(), (T)stack.mutateAmount(def.getAmount()+stack.getAmount()));
-    }
-
-    default void putUnifyAll(T... defs) {
-        for (T def : defs) {
-            putUnify(def);
-        }
-    }
-
-    default void putUnifyAll(iElementalMapR<T> inTreeUnsafe) {
-        for (T in : inTreeUnsafe.values()) {
-            putUnify(in);
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java
new file mode 100644
index 0000000000..4b0792eac9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipe.java
@@ -0,0 +1,87 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class EMRecipe<T> implements Comparable<EMRecipe<T>> {
+    private final int                         ID;
+    private final EMConstantStackMap             inEM;
+    private final IEMMapRead<? extends IEMStack> outEM;
+    private final ItemStack[]                    outItems;
+    private final FluidStack[] outFluids;
+    private       T     extension;
+
+    public EMRecipe(
+            EMConstantStackMap inEM,//not null plz
+            int id,
+            IEMMapRead<? extends IEMStack> outEM,
+            ItemStack[] outItems,
+            FluidStack[] outFluids) {
+        this.inEM = inEM;
+        this.outEM = outEM;
+        this.outItems = outItems;
+        this.outFluids = outFluids;
+        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
+    }
+
+    public EMRecipe<T> extend(T data) {
+        setExtension(data);
+        return this;
+    }
+
+    @Override
+    public int compareTo(EMRecipe<T> o) {
+        int compare = getInEM().compareTo(o.getInEM());
+        if(compare!=0) {
+            return compare;
+        }
+        return Integer.compare(getID(), o.getID());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof EMRecipe) {
+            return compareTo((EMRecipe) obj) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return getInEM().hashCode();
+    }
+
+    public int getID() {
+        return ID;
+    }
+
+    public EMConstantStackMap getInEM() {
+        return inEM;
+    }
+
+    public IEMMapRead<? extends IEMStack> getOutEM() {
+        return outEM;
+    }
+
+    public ItemStack[] getOutItems() {
+        return outItems;
+    }
+
+    public FluidStack[] getOutFluids() {
+        return outFluids;
+    }
+
+    public T getExtension() {
+        return extension;
+    }
+
+    public void setExtension(T extension) {
+        this.extension = extension;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java
new file mode 100644
index 0000000000..811a9bc370
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/EMRecipeMap.java
@@ -0,0 +1,65 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.*;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by Tec on 02.03.2017.
+ */
+public class EMRecipeMap<T> {//TODO FIX
+    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
+    private final Map<EMConstantStackMap, Map<Integer, EMRecipe<T>>> recipes;
+
+    public EMRecipeMap() {
+        recipes = new HashMap<>();
+    }
+
+    public EMRecipe<T> put(EMRecipe<T> in) {
+        Map<Integer, EMRecipe<T>> r = getRecipes().computeIfAbsent(in.getInEM(), k -> new HashMap<>());
+        return r.put(in.getID(), in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
+        //It is either bad, or unimportant if you use different id's
+    }
+
+    public void putAll(EMRecipe<T>... contents) {
+        for (EMRecipe<T> recipe : contents) {
+            put(recipe);
+        }
+    }
+
+    public EMRecipe<T> remove(IEMMapRead<EMDefinitionStack> map, int id) {
+        Map<Integer, EMRecipe<T>> recipesMap = getRecipes().get(map);
+        return recipesMap != null ? recipesMap.remove(id) : null;//todo check, suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    public Map<Integer, EMRecipe<T>> remove(IEMMapRead<EMDefinitionStack> map) {
+        return getRecipes().remove(map);//todo check, suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
+    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
+    @Deprecated
+    public Map<Integer, EMRecipe<T>> findExact(IEMMapRead<? extends IEMStack> in) {
+        return getRecipes().get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
+    }
+
+    //this does check if the map contains all the requirements for any recipe, and the required amounts
+    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
+    public Map<Integer, EMRecipe<T>> findMatch(IEMMapRead<? extends IEMStack> in) {
+        for (Map.Entry<EMConstantStackMap, Map<Integer, EMRecipe<T>>> cElementalDefinitionStackMapHashMapEntry : getRecipes().entrySet()) {
+            if (in.containsAllAmounts(cElementalDefinitionStackMapHashMapEntry.getKey())) {
+                return cElementalDefinitionStackMapHashMapEntry.getValue();
+            }
+        }
+        return null;
+    }
+
+    public Map<EMConstantStackMap, Map<Integer, EMRecipe<T>>> getRecipes() {
+        return recipes;
+    }
+
+    //To check for instance data and other things use recipe extensions!
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
deleted file mode 100644
index 8c0fb40a4b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipe.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipe implements Comparable<rElementalRecipe> {
-    public final short                      ID;
-    public final cElementalConstantStackMap inEM;
-    public final cElementalConstantStackMap outEM;
-    public final ItemStack[]                outItems;
-    public final FluidStack[] outFluids;
-    public Object[] extension;
-
-    public rElementalRecipe(
-            cElementalConstantStackMap inEM,//not null plz
-            short id,
-            cElementalConstantStackMap outEM,
-            ItemStack[] outItems,
-            FluidStack[] outFluids) {
-        this.inEM = inEM;
-        this.outEM = outEM;
-        this.outItems = outItems;
-        this.outFluids = outFluids;
-        ID = id;//allows multiple recipes with the same input EM,so u can actually extend...
-    }
-
-    public rElementalRecipe extend(Object... data) {
-        extension = data;
-        return this;
-    }
-
-    @Override
-    public int compareTo(rElementalRecipe o) {
-        int compare = inEM.compareTo(o.inEM);
-        if(compare!=0) {
-            return compare;
-        }
-        return Short.compare(ID, o.ID);
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof rElementalRecipe) {
-            return compareTo((rElementalRecipe) obj) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {
-        return inEM.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
deleted file mode 100644
index 56a9030354..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/recipes/rElementalRecipeMap.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.recipes;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.*;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by Tec on 02.03.2017.
- */
-public class rElementalRecipeMap {//TODO FIX
-    //Multimap for multiple recipes from the same thing - you know parameters might differ the output
-    private final HashMap<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> recipes;
-
-    public rElementalRecipeMap() {
-        recipes = new HashMap<>();
-    }
-
-    public rElementalRecipe put(rElementalRecipe in) {
-        HashMap<Short, rElementalRecipe> r = recipes.computeIfAbsent(in.inEM, k -> new HashMap<>());
-        return r.put(in.ID, in);//IF THIS RETURN SHIT, it means that inputs are using the exact same types of matter as input - (non amount wise collision)
-        //It is either bad, or unimportant if you use different id's
-    }
-
-    public void putAll(rElementalRecipe... contents) {
-        for (rElementalRecipe recipe : contents) {
-            put(recipe);
-        }
-    }
-
-    public rElementalRecipe remove(iElementalMapR<cElementalDefinitionStack> map, short id) {
-        return recipes.get(map).remove(id);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> remove(iElementalMapR<cElementalDefinitionStack> map) {
-        return recipes.remove(map);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    public HashMap<Short, rElementalRecipe> findExact(cElementalInstanceStackMap in) {
-        return recipes.get(in.toDefinitionMapForComparison());//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //Recipe founding should not check amounts - this checks if the types of matter in map are equal to any recipe!
-    //Return a recipeShortMap when the content of input is equal (ignoring amounts and instance data)
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findExact(iElementalMapR<cElementalDefinitionStack> in) {
-        return recipes.get(in);//suspicious but ok, equals and hashcode methods are adjusted for that
-    }
-
-    //this does check if the map contains all the requirements for any recipe, and the required amounts
-    //Return a recipeShortMap when the content of input matches the recipe input - does not ignore amounts but ignores instance data!
-    @Deprecated
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalDefinitionStackMap in, boolean testOnlyTruePreferred) {
-        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnlyTruePreferred, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    public HashMap<Short, rElementalRecipe> findMatch(cElementalInstanceStackMap in, boolean testOnly) {
-        for (Map.Entry<cElementalConstantStackMap, HashMap<Short, rElementalRecipe>> cElementalDefinitionStackMapHashMapEntry : recipes.entrySet()) {
-            if (in.removeAllAmounts(testOnly, cElementalDefinitionStackMapHashMapEntry.getKey())) {
-                return cElementalDefinitionStackMapHashMapEntry.getValue();
-            }
-        }
-        return null;
-    }
-
-    //To check for instance data and other things use recipe extensions!
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
new file mode 100644
index 0000000000..fe0c73e795
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
@@ -0,0 +1,73 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+
+/**
+ * Created by danie_000 on 20.11.2016.
+ */
+public final class EMDefinitionStack implements IEMStack {
+    private final IEMDefinition definition;
+    private final double        amount;
+
+    public EMDefinitionStack(IEMDefinition def, double amount) {
+        definition = def == null ? null__ : def;
+        this.amount = amount;
+    }
+
+    @Override
+    public EMDefinitionStack clone() {
+        return this;//IMMUTABLE
+    }
+
+    @Override
+    public EMDefinitionStack mutateAmount(double newAmount) {
+        if(getAmount() == newAmount){
+            return this;
+        }
+        return new EMDefinitionStack(getDefinition(), newAmount);//IMMUTABLE
+    }
+
+    @Override
+    public IEMDefinition getDefinition() {
+        return definition;//IMMUTABLE
+    }
+
+    @Override
+    public double getAmount() {
+        return amount;
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setDouble("Q", getAmount());
+        return nbt;
+    }
+
+    public static EMDefinitionStack fromNBT(NBTTagCompound nbt) {
+        return new EMDefinitionStack(
+                EMComplex.fromNBT(nbt.getCompoundTag("d")),
+                nbt.getLong("q")+nbt.getDouble("Q"));
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof IEMDefinition) {
+            return getDefinition().compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return getDefinition().compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    //Amount shouldn't be hashed if this is just indicating amount and not structure
+    @Override
+    public int hashCode() {
+        return getDefinition().hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
new file mode 100644
index 0000000000..b73bd21f02
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
@@ -0,0 +1,605 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.util.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static com.github.technus.tectech.util.DoubleCount.*;
+import static java.lang.Math.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMInstanceStack implements IEMStack {
+    public static int MIN_MULTIPLE_DECAY_CALLS = 4, MAX_MULTIPLE_DECAY_CALLS = 16;
+    public static double DECAY_CALL_PER = AVOGADRO_CONSTANT;//todo
+
+    private final IEMDefinition definition;
+    private       double        amount;
+
+    private double age;
+    //energy - if positive then particle should try to decay
+    private long   energy;
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
+    private byte   color;
+    private double lifeTime;
+    private double lifeTimeMult;
+
+    public EMInstanceStack(IEMStack stackSafe) {
+        this(stackSafe.getDefinition(), stackSafe.getAmount(), 1D, 0D, 0);
+    }
+
+    public EMInstanceStack(IEMStack stackSafe, double lifeTimeMult, double age, long energy) {
+        this(stackSafe.getDefinition(), stackSafe.getAmount(), lifeTimeMult, age, energy);
+    }
+
+    public EMInstanceStack(IEMDefinition defSafe, double amount) {
+        this(defSafe, amount, 1D, 0D, 0);
+    }
+
+    public EMInstanceStack(IEMDefinition defSafe, double amount, double lifeTimeMult, double age, long energy) {
+        definition = defSafe == null ? null__ : defSafe;
+        byte bColor = getDefinition().getColor();
+        if (bColor < 0 || bColor > 2) {//transforms colorable??? into proper color
+            this.color = bColor;
+        } else {
+            this.color = (byte) TecTech.RANDOM.nextInt(3);
+        }
+        this.lifeTimeMult = lifeTimeMult;
+        lifeTime = getDefinition().getRawTimeSpan(energy) * this.lifeTimeMult;
+        setEnergy(energy);
+        this.setAge(age);
+        this.setAmount(amount);
+    }
+
+    //Clone proxy
+    private EMInstanceStack(EMInstanceStack stack) {
+        definition = stack.getDefinition();
+        color = stack.color;
+        setAge(stack.getAge());
+        setAmount(stack.getAmount());
+        lifeTime = stack.lifeTime;
+        lifeTimeMult = stack.lifeTimeMult;
+        energy = stack.energy;
+    }
+
+    @Override
+    public EMInstanceStack clone() {
+        return new EMInstanceStack(this);
+    }
+
+    @Override
+    public EMInstanceStack mutateAmount(double newAmount) {
+        this.setAmount(newAmount);
+        return this;
+    }
+
+    @Override
+    public double getAmount() {
+        return amount;
+    }
+
+    public long getEnergy() {
+        return energy;
+    }
+
+    public void setEnergy(long newEnergyLevel) {
+        energy = newEnergyLevel;
+        setLifeTimeMultiplier(getLifeTimeMultiplier());
+    }
+
+    public double getEnergySettingCost(long currentEnergyLevel, long newEnergyLevel) {
+        return getDefinition().getEnergyDiffBetweenStates(currentEnergyLevel, newEnergyLevel) * getAmount();
+    }
+
+    public double getEnergySettingCost(long newEnergyLevel) {
+        return getEnergySettingCost(energy, newEnergyLevel) * getAmount();
+    }
+
+    public EMDefinitionStack getDefinitionStack() {
+        return new EMDefinitionStack(getDefinition(), getAmount());
+    }
+
+    @Override
+    public IEMDefinition getDefinition() {
+        return definition;
+    }
+
+    public byte getColor() {
+        return color;
+    }
+
+    public void setColor(byte color) {//does not allow changing magic element
+        if (this.color < 0 || this.color > 2 || color < 0 || color >= 3) {
+            return;
+        }
+        this.color = color;
+    }
+
+    public void nextColor() {//does not allow changing magic element
+        if (color < 0 || color > 2) {
+            return;
+        }
+        color = (byte) TecTech.RANDOM.nextInt(3);
+    }
+
+    public double getLifeTime() {
+        return lifeTime;
+    }
+
+    public void setLifeTimeMultiplier(double mult) {
+        if (mult <= 0) //since infinity*0=nan
+        {
+            throw new IllegalArgumentException("multiplier must be >0");
+        }
+        lifeTimeMult = mult;
+        if (getDefinition().getRawTimeSpan(energy) <= 0) {
+            return;
+        }
+        lifeTime = getDefinition().getRawTimeSpan(energy) * lifeTimeMult;
+    }
+
+    public double getLifeTimeMultiplier() {
+        return lifeTimeMult;
+    }
+
+    public EMDecayResult tickStackByOneSecond(double lifeTimeMult, int postEnergize) {
+        return tickStack(lifeTimeMult, postEnergize, 1D);
+    }
+
+    public EMDecayResult tickStack(double lifeTimeMult, int postEnergize, double seconds) {
+        setAge(getAge() + seconds);
+        EMDecayResult newInstances = decay(lifeTimeMult, getAge(), postEnergize);
+        if (newInstances == null) {
+            nextColor();
+        } else {
+            for (EMInstanceStack newInstance : newInstances.getOutput().valuesToArray()) {
+                newInstance.nextColor();
+            }
+        }
+        return newInstances;
+    }
+
+    public EMDecayResult decay() {
+        return decay(1D, getAge(), 0);//try to decay without changes
+    }
+
+    public EMDecayResult decay(double apparentAge, long postEnergize) {
+        return decay(1D, apparentAge, postEnergize);
+    }
+
+    public EMDecayResult decay(double lifeTimeMult, double apparentAge, long postEnergize) {
+        long newEnergyLevel = postEnergize + energy;
+        if (newEnergyLevel > 0) {
+            newEnergyLevel -= 1;
+        } else if (newEnergyLevel < 0) {
+            newEnergyLevel += 1;
+        }
+        EMDecayResult output;
+        if (getDefinition().usesMultipleDecayCalls(energy)) {
+            double amountTemp = getAmount();
+            int    decayCnt   = (int) min(MAX_MULTIPLE_DECAY_CALLS, max(getAmount() / DECAY_CALL_PER, MIN_MULTIPLE_DECAY_CALLS));
+            setAmount(div(getAmount(), decayCnt));
+            decayCnt--;
+
+            output = decayMechanics(lifeTimeMult, apparentAge, newEnergyLevel);
+            if (output == null) {
+                setAmount(amountTemp);
+                return null;
+            }
+
+            for (int i = 0; i < decayCnt; i++) {
+                EMDecayResult map = decayMechanics(lifeTimeMult, apparentAge, newEnergyLevel);
+                if (map != null) {
+                    output.getOutput().putUnifyAll(map.getOutput());
+                    output.setMassDiff(add(output.getMassDiff(), map.getMassDiff()));
+                    output.setMassAffected(output.getMassDiff() + map.getMassDiff());
+                }
+            }
+            setAmount(amountTemp);
+        } else {
+            output = decayMechanics(lifeTimeMult, apparentAge, newEnergyLevel);
+        }
+        if (output != null) {
+            output.getOutput().cleanUp();
+        }
+        return output;
+    }
+
+    private EMDecayResult decayMechanics(double lifeTimeMult, double apparentAge, long newEnergyLevel) {
+        if (energy > 0 && !getDefinition().usesSpecialEnergeticDecayHandling()) {
+            setLifeTimeMultiplier(getLifeTimeMultiplier());
+            return decayCompute(getDefinition().getEnergyInducedDecay(energy), lifeTimeMult, -1D, newEnergyLevel);
+        } else if (getDefinition().getRawTimeSpan(energy) < 0) {
+            return null;//return null, decay cannot be achieved
+        } else if (getDefinition().isTimeSpanHalfLife()) {
+            return exponentialDecayCompute(energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getDecayArray(), lifeTimeMult, -1D, newEnergyLevel);
+        } else {
+            if (1 > lifeTime) {
+                return decayCompute(energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getNaturalDecayInstant(), lifeTimeMult, 0D, newEnergyLevel);
+            } else if (apparentAge > lifeTime) {
+                return decayCompute(energy > 0 ? getDefinition().getEnergyInducedDecay(energy) : getDefinition().getDecayArray(), lifeTimeMult, 0D, newEnergyLevel);
+            }
+        }
+        return null;//return null since decay cannot be achieved
+    }
+
+    //Use to get direct decay output providing correct decay array
+    private EMDecayResult exponentialDecayCompute(EMDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
+        double newAmount = div(getAmount(), Math.pow(2D, 1D/* 1 second */ / lifeTime));
+
+        //if(definition.getSymbol().startsWith("U ")) {
+        //    System.out.println("newAmount = " + newAmount);
+        //    System.out.println("amountRemaining = " + amountRemaining);
+        //    for(cElementalDecay decay:decays){
+        //        System.out.println("prob = "+decay.probability);
+        //        for(cElementalDefinitionStack stack:decay.outputStacks.values()){
+        //            System.out.println("stack = " + stack.getDefinition().getSymbol() + " " + stack.amount);
+        //        }
+        //    }
+        //}
+        if (newAmount == getAmount()) {
+            newAmount -= ulpSigned(newAmount);
+        } else if (newAmount < 1) {
+            return decayCompute(decays, lifeTimeMult, newProductsAge, newEnergyLevel);
+        }
+
+        //split to non decaying and decaying part
+        double amount = this.getAmount();
+        this.setAmount(this.getAmount() - newAmount);
+        EMDecayResult products = decayCompute(decays, lifeTimeMult, newProductsAge, newEnergyLevel);
+        this.setAmount(newAmount);
+        if (products != null) {
+            products.getOutput().putUnify(clone());
+        }
+        this.setAmount(amount);
+        return products;
+    }
+
+    //Use to get direct decay output providing correct decay array
+    private EMDecayResult decayCompute(EMDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
+        if (decays == null) {
+            return null;//Can not decay so it won't
+        }
+        boolean makesEnergy = getDefinition().decayMakesEnergy(energy);
+        double  mass        = getMass();
+        if (decays.length == 0) {
+            return makesEnergy ? null : new EMDecayResult(new EMInstanceStackMap(), mass, 0);
+            //provide non null 0 length array for annihilation
+        } else if (decays.length == 1) {//only one type of decay :D, doesn't need dead end
+            if (decays[0] == deadEnd) {
+                return makesEnergy ? null : new EMDecayResult(decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, getAmount()), mass, 0);
+            }
+            EMInstanceStackMap output = decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, getAmount());
+            if (newProductsAge < 0) {
+                if (output.size() == 1) {
+                    if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                        output.getFirst().setEnergy(energy);
+                        output.getFirst().setAge(getAge());
+                    }
+                } else {
+                    for (EMInstanceStack stack : output.valuesToArray()) {
+                        if (stack.getDefinition().equals(getDefinition())) {
+                            stack.setAge(getAge());
+                        }
+                    }
+                }
+            } else {
+                if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                    output.getFirst().setEnergy(energy);
+                }
+            }
+            if (energy <= 0 && output.getMass() > mass) {
+                return null;//no energy usage to decay
+            }
+            return new EMDecayResult(new EMInstanceStackMap(), mass, makesEnergy ? output.getMass() - mass : 0);
+        } else {
+            EMDecayResult      totalOutput     = new EMDecayResult(new EMInstanceStackMap(), getMass(), 0);
+            EMInstanceStackMap output          = totalOutput.getOutput(), results;
+            int                differentDecays = decays.length;
+            double[]           probabilities   = new double[differentDecays];
+            for (int i = 0; i < probabilities.length; i++) {
+                probabilities[i] = decays[i].getProbability();
+            }
+            double[] qttyOfDecay;
+            try {
+                qttyOfDecay = distribute(getAmount(), probabilities);
+            } catch (ArithmeticException e) {
+                Minecraft.getMinecraft().crashed(new CrashReport("Decay failed for: " + this, e));
+                return null;
+            }
+            //long amountRemaining = this.amount, amount = this.amount;
+            //float remainingProbability = 1D;
+//
+            //for (int i = 0; i < differentDecays; i++) {
+            //    if (decays[i].probability >= 1D) {
+            //        long thisDecayAmount = (long) Math.floor(remainingProbability * (double) amount);
+            //        if (thisDecayAmount > 0) {
+            //            if (thisDecayAmount <= amountRemaining) {
+            //                amountRemaining -= thisDecayAmount;
+            //                qttyOfDecay[i] += thisDecayAmount;
+            //            }else {//in case too much was made
+            //                qttyOfDecay[i] += amountRemaining;
+            //                amountRemaining = 0;
+            //                //remainingProbability=0;
+            //            }
+            //        }
+            //        break;
+            //    }
+            //    long thisDecayAmount = (long) Math.floor(decays[i].probability * (double) amount);
+            //    if (thisDecayAmount <= amountRemaining && thisDecayAmount > 0) {//some was made
+            //        amountRemaining -= thisDecayAmount;
+            //        qttyOfDecay[i] += thisDecayAmount;
+            //    } else if (thisDecayAmount > amountRemaining) {//too much was made
+            //        qttyOfDecay[i] += amountRemaining;
+            //        amountRemaining = 0;
+            //        //remainingProbability=0;
+            //        break;
+            //    }
+            //    remainingProbability -= decays[i].probability;
+            //    if(remainingProbability<=0) {
+            //        break;
+            //    }
+            //}
+
+            //for (int i = 0; i < amountRemaining; i++) {
+            //    double rand = TecTech.RANDOM.nextDouble();
+            //    for (int j = 0; j < differentDecays; j++) {//looking for the thing it decayed into
+            //        rand -= decays[j].probability;
+            //        if (rand <= 0D) {
+            //            qttyOfDecay[j]++;
+            //            break;
+            //        }
+            //    }
+            //}
+
+            if (getDefinition().decayMakesEnergy(energy)) {
+                for (int i = differentDecays - 1; i >= 0; i--) {
+                    if (decays[i] == deadEnd) {
+                        EMInstanceStack clone = clone();
+                        clone.setAmount(qttyOfDecay[i]);
+                        output.putUnify(clone);
+                    } else {
+                        results = decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
+                        output.putUnifyAll(results);
+                        totalOutput.setMassDiff(add(totalOutput.getMassDiff(), results.getMass() - mass));
+                    }
+                }
+            } else {
+                for (int i = differentDecays - 1; i >= 0; i--) {
+                    results = decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
+                    output.putUnifyAll(results);
+                }
+            }
+
+            if (newProductsAge < 0) {
+                if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().setAge(getAge());
+                } else {
+                    for (EMInstanceStack stack : output.valuesToArray()) {
+                        if (stack.getDefinition().equals(getDefinition())) {
+                            stack.setAge(getAge());
+                        }
+                    }
+                }
+            } else {
+                if (output.size() == 1 && output.getFirst().getDefinition().equals(getDefinition())) {
+                    output.getFirst().setEnergy(energy);
+                    output.getFirst().setAge(getAge());
+                }
+            }
+            if (energy <= 0 && output.getMass() > getMass()) {
+                return null;//no energy usage to decay
+            }
+            return totalOutput;
+        }
+    }
+
+    public EMInstanceStack unifyIntoThis(EMInstanceStack... instances) {
+        if (instances == null) {
+            return this;
+        }
+        //returns with the definition from the first object passed
+        double energyTotal = getEnergySettingCost(0, energy);
+        long   maxEnergy   = energy;
+        long   minEnergy   = energy;
+
+        for (EMInstanceStack instance : instances) {
+            //if (instance != null && compareTo(instance) == 0) {
+            setAmount(add(getAmount(), instance.getAmount()));
+            energyTotal += instance.getEnergySettingCost(0, instance.energy);
+            maxEnergy = max(instance.energy, maxEnergy);
+            minEnergy = min(instance.energy, maxEnergy);
+            lifeTimeMult = min(lifeTimeMult, instance.lifeTimeMult);
+            setAge(max(getAge(), instance.getAge()));
+            //}
+        }
+
+        if (energyTotal >= 0) {
+            for (; maxEnergy > 0; maxEnergy--) {
+                if (getEnergySettingCost(0, maxEnergy) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(maxEnergy);
+        } else {
+            for (; minEnergy < 0; minEnergy++) {
+                if (getEnergySettingCost(minEnergy, 0) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(minEnergy);
+        }
+        return this;
+    }
+
+    public EMInstanceStack unifyIntoThisExact(EMInstanceStack... instances) {
+        if (instances == null) {
+            return this;
+        }
+        //returns with the definition from the first object passed
+        double energyTotal = getEnergySettingCost(0, energy);
+        long   maxEnergy   = energy;
+        long   minEnergy   = energy;
+
+        for (EMInstanceStack instance : instances) {
+            //if (instance != null && compareTo(instance) == 0) {
+            setAmount(getAmount() + instance.getAmount());
+            energyTotal += instance.getEnergySettingCost(0, instance.energy);
+            maxEnergy = max(instance.energy, maxEnergy);
+            minEnergy = min(instance.energy, maxEnergy);
+            lifeTimeMult = min(lifeTimeMult, instance.lifeTimeMult);
+            setAge(max(getAge(), instance.getAge()));
+            //}
+        }
+
+        if (energyTotal >= 0) {
+            for (; maxEnergy > 0; maxEnergy--) {
+                if (getEnergySettingCost(0, maxEnergy) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(maxEnergy);
+        } else {
+            for (; minEnergy < 0; minEnergy++) {
+                if (getEnergySettingCost(minEnergy, 0) < energyTotal) {
+                    break;
+                }
+            }
+            setEnergy(minEnergy);
+        }
+        return this;
+    }
+
+    public void addScanShortSymbols(ArrayList<String> lines, int[] detailsOnDepthLevels) {
+        int capabilities = detailsOnDepthLevels[0];
+        getDefinition().addScanShortSymbols(lines, capabilities, energy);
+        //scanShortSymbolsContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
+    }
+
+    //private void scanShortSymbolsContents(ArrayList<String> lines, cElementalDefinitionStackMap definitions, int depth, int[] detailsOnDepthLevels){
+    //    if(definitions!=null && depth<detailsOnDepthLevels.length){
+    //        int deeper=depth+1;
+    //        for(cElementalDefinitionStack definitionStack:definitions.values()) {
+    //            definition.addScanShortSymbols(lines,detailsOnDepthLevels[depth],energy);
+    //            scanSymbolsContents(lines,definitionStack.definition.getSubParticles(),deeper,detailsOnDepthLevels);
+    //        }
+    //    }
+    //}
+
+    public void addScanResults(ArrayList<String> lines, int[] detailsOnDepthLevels) {
+        int capabilities = detailsOnDepthLevels[0];
+        if (Util.areBitsSet(SCAN_GET_DEPTH_LEVEL, capabilities)) {
+            lines.add("DEPTH = " + 0);
+        }
+        getDefinition().addScanResults(lines, capabilities, energy);
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_MULT, capabilities)) {
+            lines.add("TIME MULT = " + lifeTimeMult);
+            if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+                lines.add("TIME SPAN = " + lifeTime + " s");
+            }
+        }
+        if (Util.areBitsSet(SCAN_GET_AGE, capabilities)) {
+            lines.add("AGE = " + getAge() + " s");
+        }
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add("COLOR = " + color + " RGB or CMY");
+        }
+        if (Util.areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) {
+            lines.add("ENERGY = " + energy);
+        }
+        if (Util.areBitsSet(SCAN_GET_AMOUNT, capabilities)) {
+            lines.add("AMOUNT = " + getAmount() / AVOGADRO_CONSTANT + " mol");
+        }
+        scanContents(lines, getDefinition().getSubParticles(), 1, detailsOnDepthLevels);
+    }
+
+    private void scanContents(ArrayList<String> lines, EMConstantStackMap definitions, int depth, int[] detailsOnDepthLevels) {
+        if (definitions != null && depth < detailsOnDepthLevels.length) {
+            int deeper = depth + 1;
+            for (EMDefinitionStack definitionStack : definitions.valuesToArray()) {
+                lines.add("");//def separator
+                if (Util.areBitsSet(SCAN_GET_DEPTH_LEVEL, detailsOnDepthLevels[depth])) {
+                    lines.add("DEPTH = " + depth);
+                }
+                getDefinition().addScanResults(lines, detailsOnDepthLevels[depth], energy);
+                if (Util.areBitsSet(SCAN_GET_AMOUNT, detailsOnDepthLevels[depth])) {
+                    lines.add("AMOUNT = " + definitionStack.getAmount());
+                }
+                scanContents(lines, definitionStack.getDefinition().getSubParticles(), deeper, detailsOnDepthLevels);
+            }
+        }
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setDouble("Q", getAmount());
+        nbt.setLong("e", energy);
+        nbt.setByte("c", color);
+        nbt.setDouble("A", getAge());
+        nbt.setDouble("M", lifeTimeMult);
+        return nbt;
+    }
+
+    public static EMInstanceStack fromNBT(NBTTagCompound nbt) {
+        NBTTagCompound definition = nbt.getCompoundTag("d");
+        EMInstanceStack instance = new EMInstanceStack(
+                EMComplex.fromNBT(definition),
+                nbt.getLong("q") + nbt.getDouble("Q"),
+                nbt.getFloat("m") + nbt.getDouble("M"),
+                nbt.getLong("a") + nbt.getDouble("A"),
+                nbt.getLong("e"));
+        instance.setColor(nbt.getByte("c"));
+        return instance;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof IEMDefinition) {
+            return getDefinition().compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return getDefinition().compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    //Amount shouldn't be hashed if this is just indicating amount and not structure, DOES NOT CARE ABOUT creativeTabTecTech INFO
+    @Override
+    public int hashCode() {
+        return getDefinition().hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return getDefinition().toString() + '\n' + getAmount() / AVOGADRO_CONSTANT + " mol\n" + getMass();
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    public double getAge() {
+        return age;
+    }
+
+    public void setAge(double age) {
+        this.age = age;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
new file mode 100644
index 0000000000..94c76634d9
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
@@ -0,0 +1,37 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Created by danie_000 on 30.01.2017.
+ */
+public interface IEMStack extends Comparable<IEMStack>,Cloneable {
+    IEMDefinition getDefinition();
+
+    double getAmount();
+
+    default double getCharge(){
+        return getDefinition().getCharge()*getAmount();
+    }
+
+    default double getMass(){
+        return getDefinition().getMass()*getAmount();
+    }
+
+    IEMStack clone();
+
+    /**
+     * Will return stack with mutated amount, it might be a new object!
+     * @param newAmount new amount
+     * @return new stack (or previous one if was mutable)
+     */
+    IEMStack mutateAmount(double newAmount);
+
+    NBTTagCompound toNBT();
+
+    @Override
+    default int compareTo(IEMStack o){
+        return getDefinition().compareTo(o.getDefinition());
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
deleted file mode 100644
index 1e03c8130f..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalDefinitionStack.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-
-/**
- * Created by danie_000 on 20.11.2016.
- */
-public final class cElementalDefinitionStack implements iElementalStack {
-    public final iElementalDefinition definition;
-    public final double amount;
-
-    public cElementalDefinitionStack(iElementalDefinition def, double amount) {
-        definition = def == null ? null__ : def;
-        this.amount = amount;
-    }
-
-    @Override
-    public cElementalDefinitionStack clone() {
-        return this;//IMMUTABLE
-    }
-
-    @Override
-    public cElementalDefinitionStack mutateAmount(double amount) {
-        if(this.amount==amount){
-            return this;
-        }
-        return new cElementalDefinitionStack(definition,amount);//IMMUTABLE
-    }
-
-    @Override
-    public iElementalDefinition getDefinition() {
-        return definition;//IMMUTABLE
-    }
-
-    @Override
-    public double getAmount() {
-        return amount;
-    }
-
-    @Override
-    public double getCharge() {
-        return definition.getCharge() * amount;
-    }
-
-    @Override
-    public double getMass() {
-        return definition.getMass() * amount;
-    }
-
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", definition.toNBT());
-        nbt.setDouble("Q", amount);
-        return nbt;
-    }
-
-    public static cElementalDefinitionStack fromNBT(NBTTagCompound nbt) {
-        return new cElementalDefinitionStack(
-                cElementalDefinition.fromNBT(nbt.getCompoundTag("d")),
-                nbt.getLong("q")+nbt.getDouble("Q"));
-    }
-
-    @Override
-    public int compareTo(iElementalStack o) {
-        return definition.compareTo(o.getDefinition());
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof iElementalDefinition) {
-            return definition.compareTo((iElementalDefinition) obj) == 0;
-        }
-        if (obj instanceof iElementalStack) {
-            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    //Amount shouldn't be hashed if this is just indicating amount and not structure
-    @Override
-    public int hashCode() {
-        return definition.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
deleted file mode 100644
index 1c06e560db..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/cElementalInstanceStack.java
+++ /dev/null
@@ -1,566 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.util.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.deadEnd;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static com.github.technus.tectech.util.DoubleCount.*;
-import static java.lang.Math.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cElementalInstanceStack implements iElementalStack {
-    public static int MIN_MULTIPLE_DECAY_CALLS=4,MAX_MULTIPLE_DECAY_CALLS=16;
-    public static double DECAY_CALL_PER=AVOGADRO_CONSTANT;//todo
-
-    public final iElementalDefinition definition;
-    //energy - if positive then particle should try to decay
-    private long energy;
-    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private byte color;
-    public double age;
-    public double amount;
-    private double lifeTime;
-    private double lifeTimeMult;
-
-    public cElementalInstanceStack(cElementalDefinitionStack stackSafe) {
-        this(stackSafe.definition, stackSafe.amount, 1D, 0D, 0);
-    }
-
-    public cElementalInstanceStack(cElementalDefinitionStack stackSafe, double lifeTimeMult, double age, long energy) {
-        this(stackSafe.definition, stackSafe.amount, lifeTimeMult, age, energy);
-    }
-
-    public cElementalInstanceStack(iElementalDefinition defSafe, double amount) {
-        this(defSafe, amount, 1D, 0D, 0);
-    }
-
-    public cElementalInstanceStack(iElementalDefinition defSafe, double amount, double lifeTimeMult, double age, long energy) {
-        definition = defSafe == null ? null__ : defSafe;
-        byte bColor = definition.getColor();
-        if (bColor < 0 || bColor > 2) {//transforms colorable??? into proper color
-            this.color = bColor;
-        } else {
-            this.color = (byte) TecTech.RANDOM.nextInt(3);
-        }
-        this.lifeTimeMult = lifeTimeMult;
-        lifeTime = definition.getRawTimeSpan(energy) * this.lifeTimeMult;
-        setEnergy(energy);
-        this.age = age;
-        this.amount = amount;
-    }
-
-    //Clone proxy
-    private cElementalInstanceStack(cElementalInstanceStack stack) {
-        definition = stack.definition;
-        color = stack.color;
-        age = stack.age;
-        amount = stack.amount;
-        lifeTime = stack.lifeTime;
-        lifeTimeMult = stack.lifeTimeMult;
-        energy = stack.energy;
-    }
-
-    @Override
-    public cElementalInstanceStack clone() {
-        return new cElementalInstanceStack(this);
-    }
-
-    @Override
-    public cElementalInstanceStack mutateAmount(double amount) {
-        this.amount = amount;
-        return this;
-    }
-
-    @Override
-    public double getAmount() {
-        return amount;
-    }
-
-    @Override
-    public double getCharge() {
-        return definition.getCharge() * amount;
-    }
-
-    @Override
-    public double getMass() {
-        return definition.getMass() * amount;
-    }
-
-    public long getEnergy() {
-        return energy;
-    }
-
-    public void setEnergy(long newEnergyLevel){
-        energy=newEnergyLevel;
-        setLifeTimeMultiplier(getLifeTimeMultiplier());
-    }
-
-    public double getEnergySettingCost(long currentEnergyLevel, long newEnergyLevel){
-        return definition.getEnergyDiffBetweenStates(currentEnergyLevel,newEnergyLevel)*amount;
-    }
-
-    public double getEnergySettingCost(long newEnergyLevel){
-        return definition.getEnergyDiffBetweenStates(energy,newEnergyLevel)*amount;
-    }
-
-    public cElementalDefinitionStack getDefinitionStack() {
-        return new cElementalDefinitionStack(definition, amount);
-    }
-
-    @Override
-    public iElementalDefinition getDefinition() {
-        return definition;
-    }
-
-    public byte getColor() {
-        return color;
-    }
-
-    public byte setColor(byte color) {//does not allow changing magic element
-        if (this.color < 0 || this.color > 2 || color < 0 || color >= 3) {
-            return this.color;
-        }
-        return this.color = color;
-    }
-
-    public byte nextColor() {//does not allow changing magic element
-        if (color < 0 || color > 2) {
-            return color;
-        }
-        return color = (byte) TecTech.RANDOM.nextInt(3);
-    }
-
-    public double getLifeTime() {
-        return lifeTime;
-    }
-
-    public double setLifeTimeMultiplier(double mult) {
-        if(mult<=0) //since infinity*0=nan
-        {
-            throw new IllegalArgumentException("multiplier must be >0");
-        }
-        lifeTimeMult = mult;
-        if (definition.getRawTimeSpan(energy) <= 0) {
-            return lifeTime;
-        }
-        lifeTime = definition.getRawTimeSpan(energy) * lifeTimeMult;
-        return lifeTime;
-    }
-
-    public double getLifeTimeMultiplier() {
-        return lifeTimeMult;
-    }
-
-    public cElementalDecayResult tickStackByOneSecond(double lifeTimeMult, int postEnergize){
-        return tickStack(lifeTimeMult,postEnergize,1D);
-    }
-
-    public cElementalDecayResult tickStack(double lifeTimeMult, int postEnergize, double seconds){
-        cElementalDecayResult newInstances = decay(lifeTimeMult, age += seconds, postEnergize);
-        if (newInstances == null) {
-            nextColor();
-        } else {
-            for (cElementalInstanceStack newInstance : newInstances.getOutput().valuesToArray()) {
-                newInstance.nextColor();
-            }
-        }
-        return newInstances;
-    }
-
-    public cElementalDecayResult decay() {
-        return decay(1D, age, 0);//try to decay without changes
-    }
-
-    public cElementalDecayResult decay(double apparentAge, long postEnergize) {
-        return decay(1D,apparentAge,postEnergize);
-    }
-
-    public cElementalDecayResult decay(double lifeTimeMult, double apparentAge, long postEnergize) {
-        long newEnergyLevel = postEnergize + energy;
-        if (newEnergyLevel > 0) {
-            newEnergyLevel -= 1;
-        } else if (newEnergyLevel < 0) {
-            newEnergyLevel += 1;
-        }
-        cElementalDecayResult output;
-        if(definition.usesMultipleDecayCalls(energy)){
-            double amountTemp=amount;
-            int decayCnt=(int) min(MAX_MULTIPLE_DECAY_CALLS,max(amount/DECAY_CALL_PER,MIN_MULTIPLE_DECAY_CALLS));
-            amount= div(amount,decayCnt);
-            decayCnt--;
-
-            output=decayMechanics(lifeTimeMult,apparentAge,newEnergyLevel);
-            if(output==null){
-                amount=amountTemp;
-                return null;
-            }
-
-            for(int i=0;i<decayCnt;i++){
-                cElementalDecayResult map=decayMechanics(lifeTimeMult,apparentAge,newEnergyLevel);
-                if(map!=null){
-                    output.getOutput().putUnifyAll(map.getOutput());
-                    output.setMassDiff(add(output.getMassDiff(),map.getMassDiff()));
-                    output.setMassAffected(output.getMassDiff()+map.getMassDiff());
-                }
-            }
-            amount=amountTemp;
-        }else{
-            output=decayMechanics(lifeTimeMult,apparentAge,newEnergyLevel);
-        }
-        if(output!=null){
-            output.getOutput().cleanUp();
-        }
-        return output;
-    }
-
-    private cElementalDecayResult decayMechanics(double lifeTimeMult, double apparentAge, long newEnergyLevel) {
-        if (energy > 0 && !definition.usesSpecialEnergeticDecayHandling()) {
-            setLifeTimeMultiplier(getLifeTimeMultiplier());
-            return decayCompute(definition.getEnergyInducedDecay(energy), lifeTimeMult, -1D, newEnergyLevel);
-        } else if (definition.getRawTimeSpan(energy) < 0) {
-            return null;//return null, decay cannot be achieved
-        } else if (definition.isTimeSpanHalfLife()) {
-            return exponentialDecayCompute(energy > 0 ? definition.getEnergyInducedDecay(energy) : definition.getDecayArray(), lifeTimeMult, -1D, newEnergyLevel);
-        } else {
-            if (1 > lifeTime) {
-                return decayCompute(energy > 0 ? definition.getEnergyInducedDecay(energy) : definition.getNaturalDecayInstant(), lifeTimeMult, 0D, newEnergyLevel);
-            } else if (apparentAge > lifeTime) {
-                return decayCompute(energy > 0 ? definition.getEnergyInducedDecay(energy) : definition.getDecayArray(), lifeTimeMult, 0D, newEnergyLevel);
-            }
-        }
-        return null;//return null since decay cannot be achieved
-    }
-
-    //Use to get direct decay output providing correct decay array
-    private cElementalDecayResult exponentialDecayCompute(cElementalDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
-        double newAmount= div(amount,Math.pow(2D,1D/* 1 second *//lifeTime));
-
-        //if(definition.getSymbol().startsWith("U ")) {
-        //    System.out.println("newAmount = " + newAmount);
-        //    System.out.println("amountRemaining = " + amountRemaining);
-        //    for(cElementalDecay decay:decays){
-        //        System.out.println("prob = "+decay.probability);
-        //        for(cElementalDefinitionStack stack:decay.outputStacks.values()){
-        //            System.out.println("stack = " + stack.getDefinition().getSymbol() + " " + stack.amount);
-        //        }
-        //    }
-        //}
-        if(newAmount==amount) {
-            newAmount-=ulp(newAmount);
-        } else if(newAmount<1) {
-            return decayCompute(decays, lifeTimeMult, newProductsAge, newEnergyLevel);
-        }
-
-        //split to non decaying and decaying part
-        double amount=this.amount;
-        this.amount-=newAmount;
-        cElementalDecayResult products=decayCompute(decays,lifeTimeMult,newProductsAge,newEnergyLevel);
-        this.amount=newAmount;
-        if(products!=null){
-            products.getOutput().putUnify(clone());
-        }
-        this.amount=amount;
-        return products;
-    }
-
-    //Use to get direct decay output providing correct decay array
-    private cElementalDecayResult decayCompute(cElementalDecay[] decays, double lifeTimeMult, double newProductsAge, long newEnergyLevel) {
-        if (decays == null) {
-            return null;//Can not decay so it wont
-        }
-        boolean makesEnergy=definition.decayMakesEnergy(energy);
-        double mass=getMass();
-        if (decays.length == 0) {
-            return makesEnergy ? null : new cElementalDecayResult(new cElementalInstanceStackMap(), mass, 0);
-            //provide non null 0 length array for annihilation
-        } else if (decays.length == 1) {//only one type of decay :D, doesn't need dead end
-            if(decays[0]==deadEnd) {
-                return makesEnergy ? null : new cElementalDecayResult(decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, amount), mass, 0);
-            }
-            cElementalInstanceStackMap output = decays[0].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, amount);
-            if(newProductsAge<0){
-                if(output.size()==1) {
-                    if(output.size()==1 && output.getFirst().definition.equals(definition)) {
-                        output.getFirst().setEnergy(energy);
-                        output.getFirst().age=age;
-                    }
-                }else {
-                    for (cElementalInstanceStack stack : output.valuesToArray()) {
-                        if (stack.definition.equals(definition)) {
-                            stack.age = age;
-                        }
-                    }
-                }
-            }else{
-                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
-                    output.getFirst().setEnergy(energy);
-                }
-            }
-            if(energy <= 0 && output.getMass() > mass){
-                return null;//no energy usage to decay
-            }
-            return new cElementalDecayResult(new cElementalInstanceStackMap(), mass, makesEnergy ? output.getMass()-mass:0);
-        } else {
-            cElementalDecayResult totalOutput = new cElementalDecayResult(new cElementalInstanceStackMap(),getMass(),0);
-            cElementalInstanceStackMap output=totalOutput.getOutput(),results;
-            int differentDecays = decays.length;
-            double[] probabilities=new double[differentDecays];
-            for (int i = 0; i < probabilities.length; i++) {
-                probabilities[i]=decays[i].probability;
-            }
-            double[] qttyOfDecay;
-            try{
-                qttyOfDecay = distribute(amount, probabilities);
-            }catch (ArithmeticException e){
-                Minecraft.getMinecraft().crashed(new CrashReport("Decay failed for: "+this.toString(),e));
-                return null;
-            }
-            //long amountRemaining = this.amount, amount = this.amount;
-            //float remainingProbability = 1D;
-//
-            //for (int i = 0; i < differentDecays; i++) {
-            //    if (decays[i].probability >= 1D) {
-            //        long thisDecayAmount = (long) Math.floor(remainingProbability * (double) amount);
-            //        if (thisDecayAmount > 0) {
-            //            if (thisDecayAmount <= amountRemaining) {
-            //                amountRemaining -= thisDecayAmount;
-            //                qttyOfDecay[i] += thisDecayAmount;
-            //            }else {//in case too much was made
-            //                qttyOfDecay[i] += amountRemaining;
-            //                amountRemaining = 0;
-            //                //remainingProbability=0;
-            //            }
-            //        }
-            //        break;
-            //    }
-            //    long thisDecayAmount = (long) Math.floor(decays[i].probability * (double) amount);
-            //    if (thisDecayAmount <= amountRemaining && thisDecayAmount > 0) {//some was made
-            //        amountRemaining -= thisDecayAmount;
-            //        qttyOfDecay[i] += thisDecayAmount;
-            //    } else if (thisDecayAmount > amountRemaining) {//too much was made
-            //        qttyOfDecay[i] += amountRemaining;
-            //        amountRemaining = 0;
-            //        //remainingProbability=0;
-            //        break;
-            //    }
-            //    remainingProbability -= decays[i].probability;
-            //    if(remainingProbability<=0) {
-            //        break;
-            //    }
-            //}
-
-            //for (int i = 0; i < amountRemaining; i++) {
-            //    double rand = TecTech.RANDOM.nextDouble();
-            //    for (int j = 0; j < differentDecays; j++) {//looking for the thing it decayed into
-            //        rand -= decays[j].probability;
-            //        if (rand <= 0D) {
-            //            qttyOfDecay[j]++;
-            //            break;
-            //        }
-            //    }
-            //}
-
-            if(definition.decayMakesEnergy(energy)){
-                for (int i = differentDecays - 1; i >= 0; i--) {
-                    if(decays[i]==deadEnd){
-                        cElementalInstanceStack clone=clone();
-                        clone.amount=qttyOfDecay[i];
-                        output.putUnify(clone);
-                    }else {
-                        results=decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
-                        output.putUnifyAll(results);
-                        totalOutput.setMassDiff(add(totalOutput.getMassDiff(),results.getMass()-mass));
-                    }
-                }
-            }else{
-                for (int i = differentDecays - 1; i >= 0; i--) {
-                    results=decays[i].getResults(lifeTimeMult, newProductsAge, newEnergyLevel, qttyOfDecay[i]);
-                    output.putUnifyAll(results);
-                }
-            }
-
-            if(newProductsAge<0) {
-                if (output.size() == 1 && output.getFirst().definition.equals(definition)) {
-                    output.getFirst().setEnergy(energy);
-                    output.getFirst().age = age;
-                } else {
-                    for (cElementalInstanceStack stack : output.valuesToArray()) {
-                        if (stack.definition.equals(definition)) {
-                            stack.age = age;
-                        }
-                    }
-                }
-            }else{
-                if(output.size()==1 && output.getFirst().definition.equals(definition)) {
-                    output.getFirst().setEnergy(energy);
-                    output.getFirst().age=age;
-                }
-            }
-            if(energy <= 0 && output.getMass() > getMass()){
-                return null;//no energy usage to decay
-            }
-            return totalOutput;
-        }
-    }
-
-    public cElementalInstanceStack unifyIntoThis(cElementalInstanceStack... instances) {
-        if (instances == null) {
-            return this;
-        }
-        //returns with the definition from the first object passed
-        double energyTotal = this.energy * amount;
-        long maxEnergy=this.energy;
-        double lifeTimeMul = lifeTimeMult;
-
-        for (cElementalInstanceStack instance : instances) {
-            if (instance != null && compareTo(instance) == 0) {
-                amount= add(amount,instance.amount);
-                energyTotal += instance.energy * instance.amount;
-                if(instance.energy>maxEnergy){
-                    maxEnergy=instance.energy;
-                }
-                lifeTimeMul = min(lifeTimeMul, instance.lifeTimeMult);
-                age = max(age, instance.age);
-            }
-        }
-
-        if (amount != 0) {
-            energyTotal /= Math.abs(amount);
-        }
-
-        double wholeParts=Math.floor(energyTotal);
-        energyTotal= min(energyTotal-wholeParts,1D)+(wholeParts>=0?-0.11709966304863834D:0.11709966304863834D);
-        long energy=(long) wholeParts + ((energyTotal > TecTech.RANDOM.nextDouble()) ? 1 : 0);
-        if(energy*energyTotal<0){
-            energy=0;
-        }
-        setEnergy(min(maxEnergy,energy));
-        return this;
-    }
-
-    public void addScanShortSymbols(ArrayList<String> lines, int[] detailsOnDepthLevels){
-        int capabilities=detailsOnDepthLevels[0];
-        definition.addScanShortSymbols(lines,capabilities,energy);
-        //scanShortSymbolsContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
-    }
-
-    //private void scanShortSymbolsContents(ArrayList<String> lines, cElementalDefinitionStackMap definitions, int depth, int[] detailsOnDepthLevels){
-    //    if(definitions!=null && depth<detailsOnDepthLevels.length){
-    //        int deeper=depth+1;
-    //        for(cElementalDefinitionStack definitionStack:definitions.values()) {
-    //            definition.addScanShortSymbols(lines,detailsOnDepthLevels[depth],energy);
-    //            scanSymbolsContents(lines,definitionStack.definition.getSubParticles(),deeper,detailsOnDepthLevels);
-    //        }
-    //    }
-    //}
-
-    public void addScanResults(ArrayList<String> lines, int[] detailsOnDepthLevels){
-        int capabilities=detailsOnDepthLevels[0];
-        if(Util.areBitsSet(SCAN_GET_DEPTH_LEVEL,capabilities)) {
-            lines.add("DEPTH = " + 0);
-        }
-        definition.addScanResults(lines,capabilities,energy);
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_MULT,capabilities)) {
-            lines.add("TIME MULT = " + lifeTimeMult);
-            if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO,capabilities)) {
-                lines.add("TIME SPAN = " + lifeTime + " s");
-            }
-        }
-        if(Util.areBitsSet(SCAN_GET_AGE,capabilities)) {
-            lines.add("AGE = " + age + " s");
-        }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add("COLOR = " + color + " RGB or CMY");
-        }
-        if(Util.areBitsSet(SCAN_GET_ENERGY_LEVEL,capabilities)) {
-            lines.add("ENERGY = " + energy);
-        }
-        if(Util.areBitsSet(SCAN_GET_AMOUNT,capabilities)) {
-            lines.add("AMOUNT = " + amount/ AVOGADRO_CONSTANT +" mol");
-        }
-        scanContents(lines,definition.getSubParticles(),1,detailsOnDepthLevels);
-    }
-
-    private void scanContents(ArrayList<String> lines, cElementalConstantStackMap definitions, int depth, int[] detailsOnDepthLevels){
-        if(definitions!=null && depth<detailsOnDepthLevels.length){
-            int deeper=depth+1;
-            for(cElementalDefinitionStack definitionStack:definitions.valuesToArray()) {
-                lines.add("");//def separator
-                if(Util.areBitsSet(SCAN_GET_DEPTH_LEVEL,detailsOnDepthLevels[depth])) {
-                    lines.add("DEPTH = " + depth);
-                }
-                definition.addScanResults(lines,detailsOnDepthLevels[depth],energy);
-                if(Util.areBitsSet(SCAN_GET_AMOUNT,detailsOnDepthLevels[depth])) {
-                    lines.add("AMOUNT = " + definitionStack.amount);
-                }
-                scanContents(lines,definitionStack.definition.getSubParticles(),deeper,detailsOnDepthLevels);
-            }
-        }
-    }
-
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", definition.toNBT());
-        nbt.setDouble("Q", amount);
-        nbt.setLong("e", energy);
-        nbt.setByte("c", color);
-        nbt.setDouble("A", age);
-        nbt.setDouble("M", lifeTimeMult);
-        return nbt;
-    }
-
-    public static cElementalInstanceStack fromNBT(NBTTagCompound nbt) {
-        NBTTagCompound definition = nbt.getCompoundTag("d");
-        cElementalInstanceStack instance = new cElementalInstanceStack(
-                cElementalDefinition.fromNBT(definition),
-                nbt.getLong("q")+nbt.getDouble("Q"),
-                nbt.getFloat("m")+nbt.getDouble("M"),
-                nbt.getLong("a")+nbt.getDouble("A"),
-                nbt.getLong("e"));
-        instance.setColor(nbt.getByte("c"));
-        return instance;
-    }
-
-    @Override
-    public int compareTo(iElementalStack o) {//use for unification
-        return definition.compareTo(o.getDefinition());
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof iElementalDefinition) {
-            return definition.compareTo((iElementalDefinition) obj) == 0;
-        }
-        if (obj instanceof iElementalStack) {
-            return definition.compareTo(((iElementalStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    //Amount shouldn't be hashed if this is just indicating amount and not structure, DOES NOT CARE ABOUT creativeTabTecTech INFO
-    @Override
-    public int hashCode() {
-        return definition.hashCode();
-    }
-
-    @Override
-    public String toString() {
-        return definition.toString() + '\n' + amount/ AVOGADRO_CONSTANT + " mol\n" + getMass();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
deleted file mode 100644
index 65f2ed3b78..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/iElementalStack.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import net.minecraft.nbt.NBTTagCompound;
-
-/**
- * Created by danie_000 on 30.01.2017.
- */
-public interface iElementalStack extends Comparable<iElementalStack>,Cloneable {
-    iElementalDefinition getDefinition();
-
-    double getAmount();
-
-    double getCharge();
-
-    double getMass();
-
-    iElementalStack clone();
-
-    iElementalStack mutateAmount(double amount);
-
-    NBTTagCompound toNBT();
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java
deleted file mode 100644
index 2adadfd062..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/tElementalException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core;
-
-/**
- * Created by danie_000 on 19.11.2016.
- */
-public final class tElementalException extends Exception {
-    public tElementalException(String message) {
-        super(message);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
new file mode 100644
index 0000000000..7fc074bded
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
@@ -0,0 +1,135 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+/**
+ * Created by danie_000 on 23.01.2017.
+ */
+public abstract class EMComplex implements IEMDefinition {
+    //Nothing array
+    public static final IEMDefinition[] nothing = new EMPrimitive[0];
+
+    //add text based creators for recipe formula input?
+    private static final Map<Byte, Method> nbtCreationBind = new HashMap<>();//creator methods in subclasses
+    private static final HashSet<Byte> classSet = new HashSet<>();
+
+    protected static void addCreatorFromNBT(byte shortcutNBT, Method constructorFromNBT,byte classID) {
+        if(nbtCreationBind.put(shortcutNBT, constructorFromNBT)!=null) {
+            throw new Error("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
+        }
+        if(!classSet.add(classID)) {
+            throw new Error("Duplicate Class ID! " + classID + " used for class comparison");
+        }
+    }
+
+    public static Map<Byte, Method> getBindsComplex(){
+        return nbtCreationBind;
+    }
+
+    @Override
+    public final EMComplex clone() {
+        return this;//IMMUTABLE
+    }
+
+    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
+        try {
+            return (IEMDefinition) nbtCreationBind.get(nbt.getByte("t")).invoke(null, nbt);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return nbtE__;
+        }
+    }
+
+    @Override
+    public int compareTo(IEMDefinition o) {
+        int classCompare = compareClassID(o);
+        if (classCompare != 0) {
+            return classCompare;
+        }
+
+        //only of the internal def stacks!!!
+        //that allows neat check if the same thing and
+        //top hierarchy amount can be used to store amount info
+        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
+    }
+
+    //use only for nested operations!
+    private static int compareInnerContentsWithAmounts(EMDefinitionStack[] tc, EMDefinitionStack[] sc) {
+        if (tc == null) {
+            if (sc == null) {
+                return 0;
+            } else {
+                return -1;
+            }
+        }
+        if (sc == null) {
+            return 1;
+        }
+
+        int lenDiff = tc.length - sc.length;
+        if (lenDiff != 0) {
+            return lenDiff;
+        }
+
+        for (int i = 0; i < tc.length; i++) {
+            int cn = tc[i].getDefinition().compareTo(sc[i].getDefinition());
+            if (cn != 0) {
+                return cn;
+            }
+
+            if (tc[i].getAmount() > sc[i].getAmount()) {
+                return 1;
+            }
+            if (tc[i].getAmount() < sc[i].getAmount()) {
+                return -1;
+            }
+        }
+        return 0;
+    }
+
+    @Override
+    public final EMDefinitionStack getStackForm(double amount) {
+        return new EMDefinitionStack(this, amount);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        if(this==obj) {
+            return true;
+        }
+        if (obj instanceof IEMDefinition) {
+            return compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Internal amounts should be also hashed
+        int hash = -(getSubParticles().size() << 4);
+        for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
+            int amount=(int) stack.getAmount();
+            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return getLocalizedName()+ '\n' + getSymbol();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
new file mode 100644
index 0000000000..587affd0f1
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
@@ -0,0 +1,283 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.client.Minecraft;
+import net.minecraft.crash.CrashReport;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+
+import static com.github.technus.tectech.util.Util.areBitsSet;
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!  (-1 to 32 can be assumed as used)
+ */
+public abstract class EMPrimitive extends EMComplex {
+    public static final byte nbtType = (byte) 'p';
+
+    private static final Map<Integer, EMPrimitive> bindsBO = new HashMap<>();
+
+    public static Map<Integer, EMPrimitive> getBindsPrimitive() {
+        return bindsBO;
+    }
+
+    private final String name;
+    private final String symbol;
+    //float-mass in eV/c^2
+    private final double mass;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    charge;
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
+    private final byte   color;
+    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
+    private final byte type;
+
+    private EMPrimitive anti;//IMMUTABLE
+    private EMDecay[]   elementalDecays;
+    private byte                naturalDecayInstant;
+    private byte energeticDecayInstant;
+    private double rawLifeTime;
+
+    private final int ID;
+
+    //no _ at end - normal particle
+    //   _ at end - anti particle
+    //  __ at end - self is antiparticle
+
+    protected EMPrimitive(String name, String symbol, int type, double mass, int charge, int color, int ID) {
+        this.name = name;
+        this.symbol = symbol;
+        this.type = (byte) type;
+        this.mass = mass;
+        this.charge = charge;
+        this.color = (byte) color;
+        this.ID = ID;
+        if (bindsBO.put(ID, this) != null) {
+            Minecraft.getMinecraft().crashed(new CrashReport("Primitive definition", new EMException("Duplicate ID")));
+        }
+        STACKS_REGISTERED.add(this);
+    }
+
+    //
+    protected void init(EMPrimitive antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
+        anti = antiParticle;
+        this.rawLifeTime = rawLifeTime;
+        naturalDecayInstant = (byte) naturalInstant;
+        energeticDecayInstant = (byte) energeticInstant;
+        elementalDecays =elementalDecaysArray;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Undefined: " + getName();
+    }
+
+    @Override
+    public String getSymbol() {
+        return symbol;
+    }
+
+    @Override
+    public String getShortSymbol() {
+        return getSymbol();
+    }
+
+    @Override
+    public IEMDefinition getAnti() {
+        return anti;//no need for copy
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    @Override
+    public byte getColor() {
+        return color;
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        if (naturalDecayInstant < 0) {
+            return elementalDecays;
+        }else if (naturalDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[naturalDecayInstant]};
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        if (energeticDecayInstant < 0) {
+            return elementalDecays;
+        }else if (energeticDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[energeticDecayInstant]};
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        return elementalDecays;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return rawLifeTime;
+    }
+
+    @Override
+    public final EMConstantStackMap getSubParticles() {
+        return null;
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public byte getType() {
+        return type;
+    }
+
+    @Override
+    public final NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setByte("t", nbtType);
+        nbt.setInteger("c", getID());
+        return nbt;
+    }
+
+    public static EMPrimitive fromNBT(NBTTagCompound content) {
+        EMPrimitive primitive = bindsBO.get(content.getInteger("c"));
+        return primitive == null ? null__ : primitive;
+    }
+
+    @Override
+    public final byte getClassType() {
+        return -128;
+    }
+
+    public static byte getClassTypeStatic(){
+        return -128;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+        }
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+ getLocalizedName());
+            lines.add("SYMBOL = "+getSymbol());
+        }
+        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    "+"At current energy level");
+        }
+    }
+
+    public static void run() {
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMPrimitive.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-128);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Primitive " + nbtType + ' ' + -128);
+        }
+    }
+
+    @Override
+    public final int compareTo(IEMDefinition o) {
+        if (getClassType() == o.getClassType()) {
+            int oID = ((EMPrimitive) o).getID();
+            return Integer.compare(getID(), oID);
+        }
+        return compareClassID(o);
+    }
+
+    @Override
+    public final int hashCode() {
+        return getID();
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getID() {
+        return ID;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
new file mode 100644
index 0000000000..7ae6d0395c
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
@@ -0,0 +1,84 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+/**
+ * Created by danie_000 on 11.11.2016.
+ */
+public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IMMUTABLE
+    double STABLE_RAW_LIFE_TIME =1.5e36D;
+    double NO_DECAY_RAW_LIFE_TIME=-1D;
+    long DEFAULT_ENERGY_LEVEL=0;
+    double DEFAULT_ENERGY_REQUIREMENT=25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
+
+    //Nomenclature
+    String getLocalizedName();
+
+    String getSymbol();
+
+    String getShortSymbol();
+
+    void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    byte getType();
+
+    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
+
+    //Not dynamically changing stuff
+    IEMDefinition getAnti();//gives new anti particle def
+
+    EMDecay[] getDecayArray();//possible decays
+
+    EMDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
+
+    EMDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
+
+    boolean usesSpecialEnergeticDecayHandling();
+
+    boolean usesMultipleDecayCalls(long energyLevel);
+
+    boolean decayMakesEnergy(long energyLevel);
+
+    boolean fusionMakesEnergy(long energyLevel);
+
+    double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
+
+    double getMass();//mass... MeV/c^2
+
+    int getCharge();//charge 1/3 electron charge
+
+    //dynamically changing stuff
+    byte getColor();//-1 nope cannot 0 it can but undefined
+
+    double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
+
+    boolean isTimeSpanHalfLife();
+
+    EMConstantStackMap getSubParticles();//contents... null if none
+
+    EMFluidDequantizationInfo someAmountIntoFluidStack();
+
+    EMItemDequantizationInfo someAmountIntoItemsStack();
+
+    EMOredictDequantizationInfo someAmountIntoOredictStack();
+
+    NBTTagCompound toNBT();
+
+    EMDefinitionStack getStackForm(double amount);
+
+    IEMDefinition clone();
+
+    default int compareClassID(IEMDefinition obj) {
+        return (int) getClassType() - obj.getClassType();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
deleted file mode 100644
index 43e42df988..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalDefinition.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 23.01.2017.
- */
-public abstract class cElementalDefinition extends iElementalDefinition {
-    //Nothing array
-    public static final iElementalDefinition[] nothing = new cElementalPrimitive[0];
-
-    //add text based creators for recipe formula input?
-    private static final Map<Byte, Method> nbtCreationBind = new HashMap<>();//creator methods in subclasses
-    private static final HashSet<Byte> classSet = new HashSet<>();
-
-    protected static void addCreatorFromNBT(byte shortcutNBT, Method constructorFromNBT,byte classID) {
-        if(nbtCreationBind.put(shortcutNBT, constructorFromNBT)!=null) {
-            throw new Error("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
-        }
-        if(!classSet.add(classID)) {
-            throw new Error("Duplicate Class ID! " + classID + " used for class comparison");
-        }
-    }
-
-    public static Map<Byte, Method> getBindsComplex(){
-        return nbtCreationBind;
-    }
-
-    @Override
-    public final cElementalDefinition clone() {
-        return this;//IMMUTABLE
-    }
-
-    public static iElementalDefinition fromNBT(NBTTagCompound nbt) {
-        try {
-            return (iElementalDefinition) nbtCreationBind.get(nbt.getByte("t")).invoke(null, nbt);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return nbtE__;
-        }
-    }
-
-    @Override
-    public int compareTo(iElementalDefinition o) {
-        int classCompare = compareClassID(o);
-        if (classCompare != 0) {
-            return classCompare;
-        }
-
-        //only of the internal def stacks!!!
-        //that allows neat check if the same thing and
-        //top hierarchy amount can be used to store amount info
-        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
-    }
-
-    //use only for nested operations!
-    private static int compareInnerContentsWithAmounts(cElementalDefinitionStack[] tc, cElementalDefinitionStack[] sc) {
-        if (tc == null) {
-            if (sc == null) {
-                return 0;
-            } else {
-                return -1;
-            }
-        }
-        if (sc == null) {
-            return 1;
-        }
-
-        int lenDiff = tc.length - sc.length;
-        if (lenDiff != 0) {
-            return lenDiff;
-        }
-
-        for (int i = 0; i < tc.length; i++) {
-            int cn = tc[i].definition.compareTo(sc[i].definition);
-            if (cn != 0) {
-                return cn;
-            }
-
-            if (tc[i].amount > sc[i].amount) {
-                return 1;
-            }
-            if (tc[i].amount < sc[i].amount) {
-                return -1;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public final cElementalDefinitionStack getStackForm(double amount) {
-        return new cElementalDefinitionStack(this, amount);
-    }
-
-    @Override
-    public final boolean equals(Object obj) {
-        if(this==obj) {
-            return true;
-        }
-        if (obj instanceof iElementalDefinition) {
-            return compareTo((iElementalDefinition) obj) == 0;
-        }
-        if (obj instanceof iElementalStack) {
-            return compareTo(((iElementalStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Internal amounts should be also hashed
-        int hash = -(getSubParticles().size() << 4);
-        for (cElementalDefinitionStack stack : getSubParticles().valuesToArray()) {
-            int amount=(int)stack.amount;
-            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.definition.hashCode();
-        }
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return getName()+ '\n' + getSymbol();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
deleted file mode 100644
index 70af6445c9..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/cElementalPrimitive.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import net.minecraft.client.Minecraft;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-
-import static com.github.technus.tectech.util.Util.areBitsSet;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.null__;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!  (-1 to 32 can be assumed as used)
- */
-public abstract class cElementalPrimitive extends cElementalDefinition {
-    public static final byte nbtType = (byte) 'p';
-
-    private static final Map<Integer, cElementalPrimitive> bindsBO = new HashMap<>();
-
-    public static Map<Integer, cElementalPrimitive> getBindsPrimitive() {
-        return bindsBO;
-    }
-
-    public final String name;
-    public final String symbol;
-    //float-mass in eV/c^2
-    public final double mass;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    public final byte charge;
-    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    public final byte color;
-    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
-    public final byte type;
-
-    private cElementalPrimitive anti;//IMMUTABLE
-    private cElementalDecay[] elementalDecays;
-    private byte naturalDecayInstant;
-    private byte energeticDecayInstant;
-    private double rawLifeTime;
-
-    public final int ID;
-
-    //no _ at end - normal particle
-    //   _ at end - anti particle
-    //  __ at end - self is antiparticle
-
-    protected cElementalPrimitive(String name, String symbol, int type, double mass, int charge, int color, int ID) {
-        this.name = name;
-        this.symbol = symbol;
-        this.type = (byte) type;
-        this.mass = mass;
-        this.charge = (byte) charge;
-        this.color = (byte) color;
-        this.ID = ID;
-        if (bindsBO.put(ID, this) != null) {
-            Minecraft.getMinecraft().crashed(new CrashReport("Primitive definition", new tElementalException("Duplicate ID")));
-        }
-        STACKS_REGISTERED.add(this);
-    }
-
-    //
-    protected void init(cElementalPrimitive antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, cElementalDecay... elementalDecaysArray) {
-        anti = antiParticle;
-        this.rawLifeTime = rawLifeTime;
-        naturalDecayInstant = (byte) naturalInstant;
-        energeticDecayInstant = (byte) energeticInstant;
-        elementalDecays =elementalDecaysArray;
-    }
-
-    @Override
-    public String getName() {
-        return "Undefined: " + name;
-    }
-
-    @Override
-    public String getSymbol() {
-        return symbol;
-    }
-
-    @Override
-    public String getShortSymbol() {
-        return symbol;
-    }
-
-    @Override
-    public iElementalDefinition getAnti() {
-        return anti;//no need for copy
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    @Override
-    public byte getColor() {
-        return color;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        if (naturalDecayInstant < 0) {
-            return elementalDecays;
-        }else if (naturalDecayInstant>=elementalDecays.length){
-            return cElementalDecay.noProduct;
-        }
-        return new cElementalDecay[]{elementalDecays[naturalDecayInstant]};
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        if (energeticDecayInstant < 0) {
-            return elementalDecays;
-        }else if (energeticDecayInstant>=elementalDecays.length){
-            return cElementalDecay.noProduct;
-        }
-        return new cElementalDecay[]{elementalDecays[energeticDecayInstant]};
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        return elementalDecays;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return rawLifeTime;
-    }
-
-    @Override
-    public final cElementalConstantStackMap getSubParticles() {
-        return null;
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    @Override
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        nbt.setInteger("c", ID);
-        return nbt;
-    }
-
-    public static cElementalPrimitive fromNBT(NBTTagCompound content) {
-        cElementalPrimitive primitive = bindsBO.get(content.getInteger("c"));
-        return primitive == null ? null__ : primitive;
-    }
-
-    @Override
-    public final byte getClassType() {
-        return -128;
-    }
-
-    public static byte getClassTypeStatic(){
-        return -128;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getName());
-            lines.add("SYMBOL = "+getSymbol());
-        }
-        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
-        }
-    }
-
-    public static void run() {
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, cElementalPrimitive.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-128);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Primitive " + nbtType + ' ' + -128);
-        }
-    }
-
-    @Override
-    public final int compareTo(iElementalDefinition o) {
-        if (getClassType() == o.getClassType()) {
-            int oID = ((cElementalPrimitive) o).ID;
-            return Integer.compare(ID, oID);
-        }
-        return compareClassID(o);
-    }
-
-    @Override
-    public final int hashCode() {
-        return ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
deleted file mode 100644
index 8065e9c170..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/iElementalDefinition.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-/**
- * Created by danie_000 on 11.11.2016.
- */
-public abstract class iElementalDefinition implements Comparable<iElementalDefinition>,Cloneable {//IMMUTABLE
-    public static final double STABLE_RAW_LIFE_TIME =1.5e36D;
-    public static final double NO_DECAY_RAW_LIFE_TIME=-1D;
-    public static final long DEFAULT_ENERGY_LEVEL=0;
-    public static final double DEFAULT_ENERGY_REQUIREMENT=25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
-
-    //Nomenclature
-    public abstract String getName();
-
-    public abstract String getSymbol();
-
-    public abstract String getShortSymbol();
-
-    public abstract void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    public abstract void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    public abstract byte getType();
-
-    public abstract byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
-
-    //Not dynamically changing stuff
-    public abstract iElementalDefinition getAnti();//gives new anti particle def
-
-    public abstract cElementalDecay[] getDecayArray();//possible decays
-
-    public abstract cElementalDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
-
-    public abstract cElementalDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
-
-    public abstract boolean usesSpecialEnergeticDecayHandling();
-
-    public abstract boolean usesMultipleDecayCalls(long energyLevel);
-
-    public abstract boolean decayMakesEnergy(long energyLevel);
-
-    public abstract boolean fusionMakesEnergy(long energyLevel);
-
-    public abstract double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
-
-    public abstract double getMass();//mass... MeV/c^2
-
-    public abstract int getCharge();//charge 1/3 electron charge
-
-    //dynamically changing stuff
-    public abstract byte getColor();//-1 nope cannot 0 it can but undefined
-
-    public abstract double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
-
-    public abstract boolean isTimeSpanHalfLife();
-
-    public abstract cElementalConstantStackMap getSubParticles();//contents... null if none
-
-    public abstract aFluidDequantizationInfo someAmountIntoFluidStack();
-
-    public abstract aItemDequantizationInfo someAmountIntoItemsStack();
-
-    public abstract aOredictDequantizationInfo someAmountIntoOredictStack();
-
-    public abstract NBTTagCompound toNBT();
-
-    public abstract cElementalDefinitionStack getStackForm(double amount);
-
-    @Override
-    public abstract iElementalDefinition clone();
-
-    final int compareClassID(iElementalDefinition obj) {
-        return (int) getClassType() - obj.getClassType();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
new file mode 100644
index 0000000000..d74c36170e
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
@@ -0,0 +1,43 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMFluidDequantizationInfo implements IEMExchangeInfo<IEMStack,FluidStack> {
+    private final IEMStack   in;
+    private final FluidStack out;
+
+    public EMFluidDequantizationInfo(IEMStack emIn, FluidStack fluidStackOut){
+        in=emIn;
+        out=fluidStackOut;
+    }
+
+    public EMFluidDequantizationInfo(IEMStack emIn, Fluid fluid, int fluidAmount){
+        in=emIn;
+        out=new FluidStack(fluid,fluidAmount);
+    }
+
+    @Override
+    public IEMStack input() {
+        return in.clone();//MEH!
+    }
+
+    @Override
+    public FluidStack output() {
+        return out.copy();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getDefinition().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMFluidDequantizationInfo && hashCode() == obj.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
new file mode 100644
index 0000000000..43fb5550aa
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
@@ -0,0 +1,43 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMFluidQuantizationInfo implements IEMExchangeInfo<FluidStack, IEMStack> {
+    private final FluidStack in;
+    private final IEMStack   out;
+
+    public EMFluidQuantizationInfo(FluidStack fluidStackIn, IEMStack emOut){
+        in=fluidStackIn;
+        out=emOut;
+    }
+
+    public EMFluidQuantizationInfo(Fluid fluid, int fluidAmount, IEMStack emOut){
+        in=new FluidStack(fluid,fluidAmount);
+        out=emOut;
+    }
+
+    @Override
+    public FluidStack input() {
+        return in.copy();
+    }
+
+    @Override
+    public IEMStack output() {
+        return out.clone();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getFluidID();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMFluidQuantizationInfo && hashCode() == obj.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
new file mode 100644
index 0000000000..af741c703d
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
@@ -0,0 +1,45 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.item.ItemStack;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMItemDequantizationInfo implements IEMExchangeInfo<IEMStack,ItemStack> {
+    private final IEMStack  in;
+    private final ItemStack out;
+
+    public EMItemDequantizationInfo(IEMStack emIn, ItemStack itemStackOut){
+        in=emIn;
+        out=itemStackOut;
+    }
+
+    public EMItemDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int amount) {
+        in = emIn;
+        out = GT_OreDictUnificator.get(prefix, material, amount);
+    }
+
+    @Override
+    public IEMStack input() {
+        return in.clone();
+    }
+
+    @Override
+    public ItemStack output() {
+        return out.copy();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getDefinition().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMItemDequantizationInfo && hashCode() == obj.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
new file mode 100644
index 0000000000..553e806d38
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
@@ -0,0 +1,69 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMItemQuantizationInfo implements IEMExchangeInfo<ItemStack, IEMStack> {
+    private final ItemStack in;
+    private final boolean   skipNBT;
+    private final IEMStack  out;
+
+    public EMItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, IEMStack emOut) {
+        in = itemStackIn;
+        out = emOut;
+        this.skipNBT = skipNBT;
+    }
+
+    public EMItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, IEMStack emOut) {
+        in = GT_OreDictUnificator.get(prefix, material, amount);
+        out = emOut;
+        this.skipNBT = skipNBT;
+    }
+
+    @Override
+    public ItemStack input() {
+        return in.copy();
+    }
+
+    @Override
+    public IEMStack output() {
+        return out.clone();
+    }
+
+    @Override
+    public int hashCode() {
+        return (GameRegistry.findUniqueIdentifierFor(in.getItem())+":"+in.getUnlocalizedName()+ ':' +in.getItemDamage()).hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if(obj instanceof EMItemQuantizationInfo){
+            //alias
+            ItemStack stack=((EMItemQuantizationInfo) obj).in;
+            if(!in.getUnlocalizedName().equals(((EMItemQuantizationInfo) obj).in.getUnlocalizedName())) {
+                return false;
+            }
+
+            if(!GameRegistry.findUniqueIdentifierFor(in.getItem()).equals(
+                GameRegistry.findUniqueIdentifierFor(((EMItemQuantizationInfo) obj).in.getItem()))) {
+                return false;
+            }
+
+            if(in.getItemDamage() != OreDictionary.WILDCARD_VALUE && stack.getItemDamage() != OreDictionary.WILDCARD_VALUE) {
+                if (in.getItemDamage() != stack.getItemDamage()) {
+                    return false;
+                }
+            }
+            return skipNBT || ItemStack.areItemStackTagsEqual(in, stack);
+        }
+        return false;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
new file mode 100644
index 0000000000..c8e337c7fd
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
@@ -0,0 +1,60 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMOredictDequantizationInfo implements IEMExchangeInfo<IEMStack,String> {
+    private final IEMStack in;
+    private final String   out;
+    private final int      amount;
+
+    public EMOredictDequantizationInfo(IEMStack emIn, String name, int qty) {
+        in = emIn;
+        out =name;
+        amount = qty;
+    }
+
+    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int qty) {
+        in = emIn;
+        out = prefix.name() + material.mName;
+        amount = qty;
+    }
+
+    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, String materialName, int qty) {
+        in = emIn;
+        out = prefix.name() + materialName;
+        amount = qty;
+    }
+
+    @Override
+    public IEMStack input() {
+        return in.clone();//MEH!
+    }
+
+    @Override
+    public String output() {
+        return getOut();
+    }
+
+    @Override
+    public int hashCode() {
+        return in.getDefinition().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMOredictDequantizationInfo && hashCode() == obj.hashCode();
+    }
+
+    public String getOut() {
+        return out;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
new file mode 100644
index 0000000000..0ca0415b0d
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
@@ -0,0 +1,60 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public class EMOredictQuantizationInfo implements IEMExchangeInfo<String, IEMStack> {
+    private final String   in;
+    private final int      amount;
+    private final IEMStack out;
+
+    public EMOredictQuantizationInfo(String name, int qty, IEMStack emOut){
+        in=name;
+        amount=qty;
+        out=emOut;
+    }
+
+    public EMOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, IEMStack emOut){
+        in=prefix.name() + material.mName;
+        amount=qty;
+        out=emOut;
+    }
+
+    public EMOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, IEMStack emOut){
+        in=prefix.name() + materialName;
+        amount=qty;
+        out=emOut;
+    }
+
+    @Override
+    public String input() {
+        return getIn();
+    }
+
+    @Override
+    public IEMStack output() {
+        return out.clone();
+    }
+
+    @Override
+    public int hashCode() {
+        return getIn().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof EMOredictQuantizationInfo && hashCode() == obj.hashCode();
+    }
+
+    public String getIn() {
+        return in;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
new file mode 100644
index 0000000000..fca79b0b6f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
@@ -0,0 +1,172 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static java.lang.Math.pow;
+
+/**
+ * Created by Tec on 26.05.2017.
+ */
+public class EMTransformationInfo {
+    /**
+     * Atom count per Mol
+     */
+    public static final double AVOGADRO_CONSTANT =6.02214076e23D;
+    /**
+     * Min. chance of existing
+     */
+    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
+    /**
+     * Quantity considered to be indifferent when computing stuff
+     */
+    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
+    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
+    public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
+    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON;
+    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
+    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON;
+
+    public static EMTransformationInfo TRANSFORMATION_INFO = new EMTransformationInfo();
+
+    private Map<Integer, EMFluidQuantizationInfo>               fluidQuantization;
+    private Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization;
+    private Map<Integer, EMOredictQuantizationInfo>             oredictQuantization;
+
+    private Map<IEMDefinition, EMFluidDequantizationInfo>   fluidDequantization;
+    private Map<IEMDefinition, EMItemDequantizationInfo>    itemDequantization;
+    private Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization;
+
+    private EMTransformationInfo() {
+        this(
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
+        );
+    }
+
+    public EMTransformationInfo(
+            Map<Integer, EMFluidQuantizationInfo> fluidQuantization,
+            Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization,
+            Map<Integer, EMOredictQuantizationInfo> oredictQuantization,
+            Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization,
+            Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization,
+            Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
+        this.setFluidQuantization(fluidQuantization);
+        this.setItemQuantization(itemQuantization);
+        this.setOredictQuantization(oredictQuantization);
+        this.setFluidDequantization(fluidDequantization);
+        this.setItemDequantization(itemDequantization);
+        this.setOredictDequantization(oredictDequantization);
+    }
+
+    public void addFluid(IEMStack em, FluidStack fluidStack){
+        getFluidQuantization().put(fluidStack.getFluidID(),new EMFluidQuantizationInfo(fluidStack,em));
+        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluidStack));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addFluid(IEMStack em, Fluid fluid, int fluidAmount){
+        getFluidQuantization().put(fluid.getID(),new EMFluidQuantizationInfo(fluid,fluidAmount,em));
+        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluid,fluidAmount));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    private void addItemQuantization(EMItemQuantizationInfo aIQI){
+        getItemQuantization().put(aIQI,aIQI);
+    }
+
+    public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT){
+        addItemQuantization(new EMItemQuantizationInfo(itemStack,skipNBT,em));
+        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,itemStack));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
+        addItemQuantization(new EMItemQuantizationInfo(prefix,material,amount,skipNBT,em));
+        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,prefix,material,amount));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addOredict(IEMStack em, String name, int qty){
+        getOredictQuantization().put(OreDictionary.getOreID(name),new EMOredictQuantizationInfo(name,qty,em));
+        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,name,qty));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty){
+        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + material.mName),new EMOredictQuantizationInfo(prefix,material,qty,em));
+        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,material,qty));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty){
+        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + materialName),new EMOredictQuantizationInfo(prefix,materialName,qty,em));
+        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,materialName,qty));
+        STACKS_REGISTERED.add(em.getDefinition());
+        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+    }
+
+    public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
+        return fluidQuantization;
+    }
+
+    public void setFluidQuantization(Map<Integer, EMFluidQuantizationInfo> fluidQuantization) {
+        this.fluidQuantization = fluidQuantization;
+    }
+
+    public Map<EMItemQuantizationInfo, EMItemQuantizationInfo> getItemQuantization() {
+        return itemQuantization;
+    }
+
+    public void setItemQuantization(Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization) {
+        this.itemQuantization = itemQuantization;
+    }
+
+    public Map<Integer, EMOredictQuantizationInfo> getOredictQuantization() {
+        return oredictQuantization;
+    }
+
+    public void setOredictQuantization(Map<Integer, EMOredictQuantizationInfo> oredictQuantization) {
+        this.oredictQuantization = oredictQuantization;
+    }
+
+    public Map<IEMDefinition, EMFluidDequantizationInfo> getFluidDequantization() {
+        return fluidDequantization;
+    }
+
+    public void setFluidDequantization(Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization) {
+        this.fluidDequantization = fluidDequantization;
+    }
+
+    public Map<IEMDefinition, EMItemDequantizationInfo> getItemDequantization() {
+        return itemDequantization;
+    }
+
+    public void setItemDequantization(Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization) {
+        this.itemDequantization = itemDequantization;
+    }
+
+    public Map<IEMDefinition, EMOredictDequantizationInfo> getOredictDequantization() {
+        return oredictDequantization;
+    }
+
+    public void setOredictDequantization(Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
+        this.oredictDequantization = oredictDequantization;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
new file mode 100644
index 0000000000..e20b0af3b5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
@@ -0,0 +1,11 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+/**
+ * Created by Tec on 23.05.2017.
+ */
+public interface IEMExchangeInfo<IN,OUT> {
+    OUT output();//what should be given - ItemStack,FluidStack,AspectStack, (EM definitionStack->)EM instance stack - etc.
+    //This must return new Object! - if obj is immutable don't care that much (applies to defStacks)
+
+    IN input();//same as above but for input
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
deleted file mode 100644
index 0d91b57ed5..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidDequantizationInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aFluidDequantizationInfo implements iExchangeInfo<iElementalStack,FluidStack> {
-    private final iElementalStack in;
-    private final FluidStack      out;
-
-    public aFluidDequantizationInfo(iElementalStack emIn, FluidStack fluidStackOut){
-        in=emIn;
-        out=fluidStackOut;
-    }
-
-    public aFluidDequantizationInfo(iElementalStack emIn, Fluid fluid, int fluidAmount){
-        in=emIn;
-        out=new FluidStack(fluid,fluidAmount);
-    }
-
-    @Override
-    public iElementalStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public FluidStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aFluidDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
deleted file mode 100644
index 39e4ec4671..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aFluidQuantizationInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aFluidQuantizationInfo implements iExchangeInfo<FluidStack, iElementalStack> {
-    private final FluidStack      in;
-    private final iElementalStack out;
-
-    public aFluidQuantizationInfo(FluidStack fluidStackIn, iElementalStack emOut){
-        in=fluidStackIn;
-        out=emOut;
-    }
-
-    public aFluidQuantizationInfo(Fluid fluid, int fluidAmount, iElementalStack emOut){
-        in=new FluidStack(fluid,fluidAmount);
-        out=emOut;
-    }
-
-    @Override
-    public FluidStack input() {
-        return in.copy();
-    }
-
-    @Override
-    public iElementalStack output() {
-        return out.clone();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getFluidID();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aFluidQuantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
deleted file mode 100644
index fb71275276..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemDequantizationInfo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aItemDequantizationInfo implements iExchangeInfo<iElementalStack,ItemStack> {
-    private final iElementalStack in;
-    private final ItemStack       out;
-
-    public aItemDequantizationInfo(iElementalStack emIn, ItemStack itemStackOut){
-        in=emIn;
-        out=itemStackOut;
-    }
-
-    public aItemDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int amount) {
-        in = emIn;
-        out = GT_OreDictUnificator.get(prefix, material, amount);
-    }
-
-    @Override
-    public iElementalStack input() {
-        return in.clone();
-    }
-
-    @Override
-    public ItemStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aItemDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
deleted file mode 100644
index da9950a186..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aItemQuantizationInfo.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aItemQuantizationInfo implements iExchangeInfo<ItemStack, iElementalStack> {
-    private final ItemStack       in;
-    private final boolean         skipNBT;
-    private final iElementalStack out;
-
-    public aItemQuantizationInfo(ItemStack itemStackIn, boolean skipNBT, iElementalStack emOut) {
-        in = itemStackIn;
-        out = emOut;
-        this.skipNBT = skipNBT;
-    }
-
-    public aItemQuantizationInfo(OrePrefixes prefix, Materials material, int amount, boolean skipNBT, iElementalStack emOut) {
-        in = GT_OreDictUnificator.get(prefix, material, amount);
-        out = emOut;
-        this.skipNBT = skipNBT;
-    }
-
-    @Override
-    public ItemStack input() {
-        return in.copy();
-    }
-
-    @Override
-    public iElementalStack output() {
-        return out.clone();
-    }
-
-    @Override
-    public int hashCode() {
-        return (GameRegistry.findUniqueIdentifierFor(in.getItem())+":"+in.getUnlocalizedName()+ ':' +in.getItemDamage()).hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if(obj instanceof  aItemQuantizationInfo){
-            //alias
-            ItemStack stack=((aItemQuantizationInfo) obj).in;
-            if(!in.getUnlocalizedName().equals(((aItemQuantizationInfo) obj).in.getUnlocalizedName())) {
-                return false;
-            }
-
-            if(!GameRegistry.findUniqueIdentifierFor(in.getItem()).equals(
-                GameRegistry.findUniqueIdentifierFor(((aItemQuantizationInfo) obj).in.getItem()))) {
-                return false;
-            }
-
-            if(in.getItemDamage() != OreDictionary.WILDCARD_VALUE && stack.getItemDamage() != OreDictionary.WILDCARD_VALUE) {
-                if (in.getItemDamage() != stack.getItemDamage()) {
-                    return false;
-                }
-            }
-            return skipNBT || ItemStack.areItemStackTagsEqual(in, stack);
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
deleted file mode 100644
index 20f2252bd8..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictDequantizationInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aOredictDequantizationInfo implements iExchangeInfo<iElementalStack,String> {
-    private final iElementalStack in;
-    public final  String          out;
-    public final  int             amount;
-
-    public aOredictDequantizationInfo(iElementalStack emIn, String name, int qty) {
-        in = emIn;
-        out =name;
-        amount = qty;
-    }
-
-    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, Materials material, int qty) {
-        in = emIn;
-        out = prefix.name() + material.mName;
-        amount = qty;
-    }
-
-    public aOredictDequantizationInfo(iElementalStack emIn, OrePrefixes prefix, String materialName, int qty) {
-        in = emIn;
-        out = prefix.name() + materialName;
-        amount = qty;
-    }
-
-    @Override
-    public iElementalStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public String output() {
-        return out;
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aOredictDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
deleted file mode 100644
index 252b524185..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/aOredictQuantizationInfo.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class aOredictQuantizationInfo implements iExchangeInfo<String, iElementalStack> {
-    public final  String          in;
-    public final  int             amount;
-    private final iElementalStack out;
-
-    public aOredictQuantizationInfo(String name, int qty, iElementalStack emOut){
-        in=name;
-        amount=qty;
-        out=emOut;
-    }
-
-    public aOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, iElementalStack emOut){
-        in=prefix.name() + material.mName;
-        amount=qty;
-        out=emOut;
-    }
-
-    public aOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, iElementalStack emOut){
-        in=prefix.name() + materialName;
-        amount=qty;
-        out=emOut;
-    }
-
-    @Override
-    public String input() {
-        return in;
-    }
-
-    @Override
-    public iElementalStack output() {
-        return out.clone();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof aOredictQuantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
deleted file mode 100644
index 39f946c54a..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/bTransformationInfo.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-import static java.lang.Math.pow;
-
-/**
- * Created by Tec on 26.05.2017.
- */
-public class bTransformationInfo {
-    /**
-     * Atom count per Mol
-     */
-    public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    /**
-     * Min. chance of existing
-     */
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
-    /**
-     * Quantity considered to be indifferent when computing stuff
-     */
-    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
-    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
-    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON*144D;
-    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
-    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON*1000D;
-
-    public static bTransformationInfo TRANSFORMATION_INFO = new bTransformationInfo();
-
-    public Map<Integer,aFluidQuantizationInfo> fluidQuantization;
-    public Map<aItemQuantizationInfo,aItemQuantizationInfo> itemQuantization;
-    public Map<Integer,aOredictQuantizationInfo> oredictQuantization;
-
-    public Map<iElementalDefinition,aFluidDequantizationInfo> fluidDequantization;
-    public Map<iElementalDefinition,aItemDequantizationInfo> itemDequantization;
-    public Map<iElementalDefinition,aOredictDequantizationInfo> oredictDequantization;
-
-    private bTransformationInfo() {
-        this(
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
-        );
-    }
-
-    public bTransformationInfo(
-            Map<Integer, aFluidQuantizationInfo> fluidQuantization,
-            Map<aItemQuantizationInfo, aItemQuantizationInfo> itemQuantization,
-            Map<Integer, aOredictQuantizationInfo> oredictQuantization,
-            Map<iElementalDefinition, aFluidDequantizationInfo> fluidDequantization,
-            Map<iElementalDefinition, aItemDequantizationInfo> itemDequantization,
-            Map<iElementalDefinition, aOredictDequantizationInfo> oredictDequantization) {
-        this.fluidQuantization = fluidQuantization;
-        this.itemQuantization = itemQuantization;
-        this.oredictQuantization = oredictQuantization;
-        this.fluidDequantization = fluidDequantization;
-        this.itemDequantization = itemDequantization;
-        this.oredictDequantization = oredictDequantization;
-    }
-
-    public void addFluid(iElementalStack em, FluidStack fluidStack){
-        fluidQuantization.put(fluidStack.getFluidID(),new aFluidQuantizationInfo(fluidStack,em));
-        fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluidStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addFluid(iElementalStack em, Fluid fluid, int fluidAmount){
-        fluidQuantization.put(fluid.getID(),new aFluidQuantizationInfo(fluid,fluidAmount,em));
-        fluidDequantization.put(em.getDefinition(),new aFluidDequantizationInfo(em,fluid,fluidAmount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    private void addItemQuantization(aItemQuantizationInfo aIQI){
-        itemQuantization.put(aIQI,aIQI);
-    }
-
-    public void addItem(iElementalStack em, ItemStack itemStack, boolean skipNBT){
-        addItemQuantization(new aItemQuantizationInfo(itemStack,skipNBT,em));
-        itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,itemStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addItem(iElementalStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
-        addItemQuantization(new aItemQuantizationInfo(prefix,material,amount,skipNBT,em));
-        itemDequantization.put(em.getDefinition(),new aItemDequantizationInfo(em,prefix,material,amount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addOredict(iElementalStack em, String name, int qty){
-        oredictQuantization.put(OreDictionary.getOreID(name),new aOredictQuantizationInfo(name,qty,em));
-        oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,name,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addOredict(iElementalStack em, OrePrefixes prefix, Materials material, int qty){
-        oredictQuantization.put(OreDictionary.getOreID(prefix.name() + material.mName),new aOredictQuantizationInfo(prefix,material,qty,em));
-        oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,material,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-
-    public void addOredict(iElementalStack em, OrePrefixes prefix, String materialName, int qty){
-        oredictQuantization.put(OreDictionary.getOreID(prefix.name() + materialName),new aOredictQuantizationInfo(prefix,materialName,qty,em));
-        oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,materialName,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java
deleted file mode 100644
index 2e8ef92073..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/iExchangeInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public interface iExchangeInfo<IN,OUT> {
-    OUT output();//what should be given - ItemStack,FluidStack,AspectStack, (EM definitionStack->)EM instance stack - etc.
-    //This must return new Object! - if obj is immutable don't care that much (applies to defStacks)
-
-    IN input();//same as above but for input
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
new file mode 100644
index 0000000000..77ac6c46c4
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -0,0 +1,1694 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
+
+import com.github.technus.tectech.Reference;
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition;
+import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.XSTR;
+import cpw.mods.fml.common.Loader;
+import gregtech.api.enums.Materials;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
+import static gregtech.api.enums.OrePrefixes.dust;
+
+/**
+ * Created by danie_000 on 18.11.2016.
+ */
+public final class EMAtomDefinition extends EMComplex {
+    public static final long ATOM_COMPLEXITY_LIMIT=65536L;
+    private static final byte BYTE_OFFSET=32;
+
+    private final int hash;
+    public static double refMass, refUnstableMass;
+
+    private static final byte                                   nbtType                    = (byte) 'a';
+    private static final Random                                 xstr                       = new XSTR();//NEEDS SEPARATE!
+    private static       Map<Integer, TreeSet<Integer>>         stableIsotopes             = new HashMap<>();
+    private static final Map<Integer, EMAtomDefinition>         stableAtoms                = new HashMap<>();
+    private static       Map<Integer, TreeMap<Double, Integer>> mostStableUnstableIsotopes = new HashMap<>();
+    private static final Map<Integer, EMAtomDefinition>         unstableAtoms              = new HashMap<>();
+    private static       EMDefinitionStack                      alpha,deuterium,tritium,helium_3,beryllium_8,carbon_14,neon_24,silicon_34;
+    private static final HashMap<EMAtomDefinition,Double> lifetimeOverrides = new HashMap<>();
+
+    private final EMNuclideIAEA iaea;
+
+    private static EMAtomDefinition somethingHeavy;
+    public static EMAtomDefinition getSomethingHeavy() {
+        return somethingHeavy;
+    }
+
+    private static final ArrayList<Runnable> overrides = new ArrayList<>();
+    public static void addOverride(EMAtomDefinition atom, double rawLifeTime){
+        lifetimeOverrides.put(atom,rawLifeTime);
+    }
+
+    //float-mass in eV/c^2
+    private final double mass;
+    //public final int charge;
+    private final int    charge;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    chargeLeptons;
+    private       double rawLifeTime;
+    //generation max present inside - minus if contains any anti quark
+    private final byte   type;
+
+    private final byte decayMode;//t neutron to proton+,0,f proton to neutron
+    //public final boolean stable;
+
+    private final int neutralCount;
+    private final int element;
+
+    private final boolean iaeaDefinitionExistsAndHasEnergyLevels;
+
+    private final EMConstantStackMap elementalStacks;
+
+    //stable is rawLifeTime>=10^9
+
+    public EMAtomDefinition(EMDefinitionStack... things) throws EMException {
+        this(true, new EMConstantStackMap(things));
+    }
+
+    private EMAtomDefinition(boolean check, EMDefinitionStack... things) throws EMException {
+        this(check, new EMConstantStackMap(things));
+    }
+
+    public EMAtomDefinition(EMConstantStackMap things) throws EMException {
+        this(true, things);
+    }
+
+    private EMAtomDefinition(boolean check, EMConstantStackMap things) throws EMException {
+        if (check && !canTheyBeTogether(things)) {
+            throw new EMException("Atom Definition error");
+        }
+        elementalStacks = things;
+
+        double mass = 0;
+        int cLeptons = 0;
+        int cNucleus = 0;
+        int neutralCount = 0, element = 0;
+        int type = 0;
+        boolean containsAnti = false;
+        for (EMDefinitionStack stack : elementalStacks.valuesToArray()) {
+            IEMDefinition def    = stack.getDefinition();
+            int           amount = (int) stack.getAmount();
+            if((int) stack.getAmount() != stack.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            mass += stack.getMass();
+            if (def.getType() < 0) {
+                containsAnti = true;
+            }
+            type = Math.max(type, Math.abs(def.getType()));
+
+            if (def instanceof EMLeptonDefinition) {
+                cLeptons += stack.getCharge();
+            } else {
+                cNucleus += stack.getCharge();
+                if (def.getCharge() == 3) {
+                    element += amount;
+                } else if (def.getCharge() == -3) {
+                    element -= amount;
+                } else if (def.getCharge() == 0) {
+                    neutralCount += amount;
+                }
+            }
+        }
+        this.type = containsAnti ? (byte) -type : (byte) type;
+        //this.mass = mass;
+        chargeLeptons = cLeptons;
+        charge = cNucleus + cLeptons;
+        this.neutralCount = neutralCount;
+        this.element = element;
+
+        element = Math.abs(element);
+
+        //stability curve
+        int StableIsotope = stableIzoCurve(element);
+        int izoDiff = neutralCount - StableIsotope;
+        int izoDiffAbs = Math.abs(izoDiff);
+
+        xstr.setSeed((element + 1L) * (neutralCount + 100L));
+        iaea = EMNuclideIAEA.get(element,neutralCount);
+        if(getIaea() !=null){
+            if(Double.isNaN(getIaea().getMass())) {
+                this.mass = mass;
+            } else {
+                this.mass = getIaea().getMass();
+            }
+
+            if(Double.isNaN(getIaea().getHalfTime())) {
+                Double overriddenLifeTime= lifetimeOverrides.get(this);
+                double rawLifeTimeTemp;
+                if(overriddenLifeTime!=null) {
+                    rawLifeTimeTemp = overriddenLifeTime;
+                } else {
+                    rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
+                }
+                rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
+            }else {
+                rawLifeTime = containsAnti ? getIaea().getHalfTime() * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) : getIaea().getHalfTime();
+            }
+            iaeaDefinitionExistsAndHasEnergyLevels = getIaea().getEnergeticStatesArray().length>1;
+        }else{
+            this.mass=mass;
+
+            Double overriddenLifeTime= lifetimeOverrides.get(this);
+            double rawLifeTimeTemp;
+            if(overriddenLifeTime!=null) {
+                rawLifeTimeTemp = overriddenLifeTime;
+            } else {
+                rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
+            }
+            rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
+
+            iaeaDefinitionExistsAndHasEnergyLevels =false;
+        }
+
+        if(getIaea() ==null || getIaea().getEnergeticStatesArray()[0].energy!=0) {
+            if (izoDiff == 0) {
+                decayMode = 0;
+            } else {
+                decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4);
+            }
+        }else{
+            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4)+ BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
+        }
+        //this.stable = this.rawLifeTime >= STABLE_RAW_LIFE_TIME;
+        hash=super.hashCode();
+    }
+
+    private static int stableIzoCurve(int element) {
+        return (int) Math.round(-1.19561E-06D * Math.pow(element, 4D) +
+                1.60885E-04D * Math.pow(element, 3D) +
+                3.76604E-04D * Math.pow(element, 2D) +
+                1.08418E+00D * (double) element);
+    }
+
+    private static double calculateLifeTime(int izoDiff, int izoDiffAbs, int element, int isotope, boolean containsAnti) {
+        double rawLifeTime;
+
+        if (element <= 83 && isotope < 127 && (izoDiffAbs == 0 || element == 1 && isotope == 0 || element == 2 && isotope == 1 || izoDiffAbs == 1 && element > 2 && element % 2 == 1 || izoDiffAbs == 3 && element > 30 && element % 2 == 0 || izoDiffAbs == 5 && element > 30 && element % 2 == 0 || izoDiffAbs == 2 && element > 20 && element % 2 == 1)) {
+            rawLifeTime = (1D + xstr.nextDouble() * 9D) * (containsAnti ? 2.381e4D : 1.5347e25D);
+        } else {
+            //Y = (X-A)/(B-A) * (D-C) + C
+            double unstabilityEXP;
+            if (element == 0) {
+                return 1e-35D;
+            } else if (element == 1) {
+                unstabilityEXP = 1.743D - Math.abs(izoDiff - 1) * 9.743D;
+            } else if (element == 2) {
+                switch (isotope) {
+                    case 4:
+                        unstabilityEXP = 1.61D;
+                        break;
+                    case 5:
+                        unstabilityEXP = -7.523D;
+                        break;
+                    case 6:
+                        unstabilityEXP = -1.51D;
+                        break;
+                    default:
+                        unstabilityEXP = -(izoDiffAbs * 6.165D);
+                        break;
+                }
+            } else if (element <= 83 || isotope <= 127 && element <= 120) {
+                double elementPow4 = Math.pow(element, 4);
+
+                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - Math.abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
+            } else if (element < 180) {
+                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - Math.abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
+            } else {
+                return -1;
+            }
+            if ((isotope == 127 || isotope == 128) && element < 120 && element > 83) {
+                unstabilityEXP -= 1.8D;
+            }
+            if (element > 83 && element < 93 && isotope % 2 == 0 && izoDiff == 3) {
+                unstabilityEXP += 6;
+            }
+            if (element > 93 && element < 103 && isotope % 2 == 0 && izoDiff == 4) {
+                unstabilityEXP += 6;
+            }
+            rawLifeTime = (containsAnti ? 1e-8D : 1) * Math.pow(10D, unstabilityEXP) * (1D + xstr.nextDouble() * 9D);
+        }
+
+        if (rawLifeTime < 8e-15D) {
+            return 1e-35D;
+        }
+        if (rawLifeTime > 8e28D) {
+            return 8e30D;
+        }
+        return rawLifeTime;
+    }
+
+    private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
+        boolean nuclei = false;
+        long qty=0;
+        for (EMDefinitionStack stack : stacks.valuesToArray()) {
+            if (stack.getDefinition() instanceof EMHadronDefinition) {
+                if (((EMHadronDefinition) stack.getDefinition()).getAmount() != 3) {
+                    return false;
+                }
+                nuclei = true;
+            } else if (!(stack.getDefinition() instanceof EMLeptonDefinition)) {
+                return false;
+            }
+            if((int) stack.getAmount() != stack.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            qty+= stack.getAmount();
+        }
+        return nuclei && qty<ATOM_COMPLEXITY_LIMIT;
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    public int getChargeLeptons() {
+        return chargeLeptons;
+    }
+
+    public int getChargeHadrons() {
+        return getCharge() - getChargeLeptons();
+    }
+
+    public int getIonizationElementWise() {
+        return getElement() * 3 + getChargeLeptons();
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public byte getType() {
+        return type;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        if(currentEnergy<=0) {
+            return rawLifeTime;
+        }
+        if(iaeaDefinitionExistsAndHasEnergyLevels){
+            if(currentEnergy>= getIaea().getEnergeticStatesArray().length){
+                return getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].Thalf/(currentEnergy- getIaea().getEnergeticStatesArray().length+1);
+            }
+            return getIaea().getEnergeticStatesArray()[(int)currentEnergy].Thalf;
+        }
+        return rawLifeTime/(currentEnergy+1);
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+
+    @Override
+    public byte getColor() {
+        return -10;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        int element = Math.abs(this.getElement());
+        boolean negative = this.getElement() < 0;
+        try {
+            if (Math.abs(getType()) != 1) {
+                return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
+            }
+            return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return (negative ? "Element: ~" : "Element: ") + element;
+        }
+    }
+
+    @Override
+    public String getSymbol() {
+        int element = Math.abs(this.getElement());
+        boolean negative = this.getElement() < 0;
+        try {
+            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            try {
+                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
+                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+            } catch (Exception E) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+            }
+        }
+    }
+
+    @Override
+    public String getShortSymbol() {
+        int element = Math.abs(this.getElement());
+        boolean negative = this.getElement() < 0;
+        try {
+            return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            try {
+                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
+                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1];
+            } catch (Exception E) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return (negative ? "~" : "") + "?";
+            }
+        }
+    }
+
+    @Override
+    public EMConstantStackMap getSubParticles() {
+        return elementalStacks.clone();
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        ArrayList<EMDecay> decaysList =new ArrayList<>(4);
+        return getDecayArray(decaysList, getDecayMode(),true);
+    }
+
+    private EMDecay[] getDecayArray(ArrayList<EMDecay> decaysList, int decayMode, boolean tryAnti) {//todo?
+        if (getType() == 1) {
+            switch (decayMode) {
+                case -2:
+                    if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    } else if(PbetaDecay(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case -1:
+                    if(Emmision(decaysList, EMHadronDefinition.hadron_p1)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case 0:
+                    if(alphaDecay(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case 1:
+                    if(Emmision(decaysList, EMHadronDefinition.hadron_n1)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                case 2:
+                    if(MbetaDecay(decaysList)) {
+                        return decaysList.toArray(EMDecay.NO_PRODUCT);
+                    }
+                    break;
+                default:
+                    if(decayMode>8){
+                        if(iaeaDecay(decaysList,0)) {
+                            return decaysList.toArray(EMDecay.NO_PRODUCT);
+                        }
+                        return getDecayArray(decaysList,decayMode- BYTE_OFFSET,false);
+                    }
+            }
+            return EMDecay.NO_DECAY;
+        }else if(getType() ==-1){
+            EMAtomDefinition anti =getAnti();
+            if(anti!=null) {
+                return anti.getDecayArray(decaysList, decayMode, false);
+            }
+        }
+        return getNaturalDecayInstant();
+    }
+
+    private boolean iaeaDecay(ArrayList<EMDecay> decaysList, long energy){
+        EMNuclideIAEA.energeticState state;
+        if(energy> getIaea().getEnergeticStatesArray().length) {
+            state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
+        } else if(energy<=0) {
+            state = getIaea().getEnergeticStatesArray()[0];
+        } else {
+            state = getIaea().getEnergeticStatesArray()[(int) energy];
+        }
+        for (int i=0;i<state.decaymodes.length;i++){
+            if(!getDecayFromIaea(decaysList,state.decaymodes[i],energy)) {
+                decaysList.clear();
+                return false;
+            }
+        }
+        return !decaysList.isEmpty();
+    }
+
+    private boolean getDecayFromIaea(ArrayList<EMDecay> decaysList, EMNuclideIAEA.iaeaDecay decay, long energy){
+        EMDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new EMDefinitionStackMap();
+        switch (decay.decayName){
+            case "D": {
+                if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())){
+                    withThis.putReplace(deuterium);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "3H": {
+                if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())){
+                    withThis.putReplace(tritium);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "3HE": {
+                if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())){
+                    withThis.putReplace(helium_3);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "8BE": {
+                if (withThis.removeAllAmountsExact(beryllium_8.getDefinition().getSubParticles())){
+                    withThis.putReplace(beryllium_8);
+                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    return true;
+                }
+            } break;
+            case "14C": {
+                if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())){
+                    newStuff.putReplace(carbon_14);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "24NE": {
+                if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())){
+                    newStuff.putReplace(neon_24);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "34SI": {
+                if (withThis.removeAllAmountsExact(silicon_34.getDefinition().getSubParticles())){
+                    newStuff.putReplace(silicon_34);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "A": case "A?": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)){
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_2);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2B-": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e2);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "EC": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2EC": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B++EC": case "EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+A": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B+2P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-A": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_n1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-2N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_n2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "B-P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECA": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(alpha);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECP": {
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "EC2P": {
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECP+EC2P": {//todo look at branching ratios
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    newStuff.putReplace(EMHadronDefinition.hadron_p3);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_n1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2N": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_n2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_p1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "2P": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                    newStuff.putReplace(EMHadronDefinition.hadron_p2);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "SF": {
+                if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
+                    return true;
+                }
+            } break;
+            case "B-F": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "ECF": case "ECSF": case "EC(+SF)": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "SF(+EC+B+)": case "SF+EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "SF+EC+B-": {
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)){
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
+                    try{
+                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                            return true;
+                        }
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "IT": case "IT?": case "G": {
+                if(energy>0){
+                    decaysList.add(new EMDecay(decay.chance, this, boson_Y__));
+                }else{
+                    if(DEBUG_MODE) {
+                        TecTech.LOGGER.info("Tried to emit Gamma from ground state");
+                    }
+                    decaysList.add(new EMDecay(decay.chance, this));
+                }
+                return true;
+            } //break;
+            case "IT+EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                    withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
+                    newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
+                    newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
+                    newStuff.putReplace(EMBosonDefinition.boson_Y__1);
+                    try{
+                        newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
+                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        return true;
+                    }catch (Exception e){
+                        if(DEBUG_MODE) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } break;
+            case "DEAD_END":
+                decaysList.add(deadEnd);
+                return true;
+            default: throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + getNeutralCount() + ' ' + getElement());
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Failed to decay " + getElement() + ' ' + getNeutralCount() + ' ' + decay.decayName);
+        }
+        return false;
+    }
+
+    private boolean Emmision(ArrayList<EMDecay> decaysList, EMDefinitionStack emit) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAmountExact(emit)) {
+            try {
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), emit));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean alphaDecay(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAllAmountsExact(alpha.getDefinition().getSubParticles())) {
+            try {
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), alpha));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean MbetaDecay(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAmountExact(EMHadronDefinition.hadron_n1)) {
+            try {
+                tree.putUnifyExact(EMHadronDefinition.hadron_p1);
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), EMLeptonDefinition.lepton_e1, EMNeutrinoDefinition.lepton_Ve_1));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean PbetaDecay(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAmountExact(EMHadronDefinition.hadron_p1)) {
+            try {
+                tree.putUnifyExact(EMHadronDefinition.hadron_n1);
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), EMLeptonDefinition.lepton_e_1, EMNeutrinoDefinition.lepton_Ve1));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean ElectronCapture(ArrayList<EMDecay> decaysList) {
+        EMDefinitionStackMap tree = elementalStacks.toMutable();
+        if (tree.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) {
+            try {
+                tree.putUnifyExact(EMHadronDefinition.hadron_n1);
+                decaysList.add(new EMDecay(1, new EMDefinitionStack(new EMAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), EMNeutrinoDefinition.lepton_Ve1));
+                return true;
+            } catch (Exception e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return false;
+    }
+
+    private boolean Fission(ArrayList<EMDecay> decaysList, EMDefinitionStackMap fissile, EMDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
+        EMDefinitionStackMap heavy      = new EMDefinitionStackMap();
+        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement())<=97);
+
+        for(EMDefinitionStack stack: fissile.valuesToArray()){
+            if(spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
+                    (stack.getAmount() <=80 || stack.getAmount() <90 && XSTR_INSTANCE.nextInt(10)< stack.getAmount() -80)) {
+                return false;
+            }
+            if(stack.getDefinition().getCharge()==0){
+                //if(stack.definition instanceof dHadronDefinition){
+                    double neutrals= stack.getAmount() *liquidDrop[2];
+                    int neutrals_cnt=(int)Math.floor(neutrals);
+                    neutrals_cnt+=neutrals-neutrals_cnt>XSTR_INSTANCE.nextDouble()?1:0;
+                    particles.putUnifyExact(new EMDefinitionStack(stack.getDefinition(), neutrals_cnt));
+
+                    int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[1]);
+                    while(heavy_cnt+neutrals_cnt> stack.getAmount()) {
+                        heavy_cnt--;
+                    }
+                    fissile.removeAmountExact(new EMDefinitionStack(stack.getDefinition(),heavy_cnt+neutrals_cnt));
+                    heavy.putReplace(new EMDefinitionStack(stack.getDefinition(), heavy_cnt));
+                //}else{
+                //    particles.add(stack);
+                //    light.remove(stack.definition);
+                //}
+            }else{
+                int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[0]);
+                if(heavy_cnt%2==1 && XSTR_INSTANCE.nextDouble()>0.05D) {
+                    heavy_cnt--;
+                }
+                EMDefinitionStack new_stack =new EMDefinitionStack(stack.getDefinition(), heavy_cnt);
+                fissile.removeAmountExact(new_stack);
+                heavy.putReplace(new_stack);
+            }
+        }
+
+        try {
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            decaysList.add(new EMDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+            return true;
+        } catch (Exception e) {
+            if(DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
+
+    private static double[] liquidDropFunction(boolean asymmetric) {
+        double[] out = new double[3];
+
+        out[0] = XSTR_INSTANCE.nextGaussian();
+
+        if (out[0] < 1 && out[0] >= -1) {
+            if (XSTR_INSTANCE.nextBoolean()) {
+                out[0] = XSTR_INSTANCE.nextDouble() * 2d - 1d;
+            }
+        }
+
+        if (asymmetric && out[0] > XSTR_INSTANCE.nextDouble() && XSTR_INSTANCE.nextInt(4) == 0) {
+            out[0] = -out[0];
+        }
+
+        //scale to splitting ratio
+        out[0] = out[0] * 0.05d + .6d;
+
+        if (out[0] < 0 || out[0] > 1) {
+            return liquidDropFunction(asymmetric);
+        }
+        if (out[0] < .5d) {
+            out[0] = 1d - out[0];
+        }
+
+        //extra neutrals
+        out[2] = 0.012d + XSTR_INSTANCE.nextDouble() * 0.01d;
+
+        if (asymmetric) {
+            out[1] = out[0];
+        } else {
+            out[1] = out[0] - out[2] * .5d;
+        }
+
+        return out;
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        if (iaeaDefinitionExistsAndHasEnergyLevels) {
+            ArrayList<EMDecay> decays =new ArrayList<>(4);
+            if(iaeaDecay(decays,energyLevel)){
+                return decays.toArray(EMDecay.NO_PRODUCT);
+            }
+        }
+        if(energyLevel< Math.abs(getCharge())/3+ getNeutralCount()) {
+            return new EMDecay[]{new EMDecay(1, this, boson_Y__)};
+        }
+        return getNaturalDecayInstant();
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel,long newEnergyLevel) {
+        if(iaeaDefinitionExistsAndHasEnergyLevels){
+            double result=0;
+            boolean backwards=newEnergyLevel<currentEnergyLevel;
+            if(backwards){
+                long temp=currentEnergyLevel;
+                currentEnergyLevel=newEnergyLevel;
+                newEnergyLevel=temp;
+            }
+
+            if(currentEnergyLevel<=0){
+                if(newEnergyLevel<=0) {
+                    return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
+                } else {
+                    result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * -currentEnergyLevel;
+                }
+            }else {
+                result -= getIaea().getEnergeticStatesArray()[(int) Math.min(getIaea().getEnergeticStatesArray().length - 1, currentEnergyLevel)].energy;
+            }
+            if(newEnergyLevel>= getIaea().getEnergeticStatesArray().length){
+                if(currentEnergyLevel>= getIaea().getEnergeticStatesArray().length) {
+                    return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
+                } else {
+                    result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - getIaea().getEnergeticStatesArray().length + 1);
+                }
+                result+= getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].energy;
+            }else {
+                result += getIaea().getEnergeticStatesArray()[(int) newEnergyLevel].energy;
+            }
+
+            return backwards?-result:result;
+        }
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return iaeaDefinitionExistsAndHasEnergyLevels;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        if(!iaeaDefinitionExistsAndHasEnergyLevels) return false;
+        EMNuclideIAEA.energeticState state;
+        if(energyLevel> getIaea().getEnergeticStatesArray().length) {
+            state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
+        } else if(energyLevel<=0) {
+            state = getIaea().getEnergeticStatesArray()[0];
+        } else {
+            state = getIaea().getEnergeticStatesArray()[(int) energyLevel];
+        }
+        for (EMNuclideIAEA.iaeaDecay decay:state.decaymodes){
+            if(decay.decayName.contains("F")) return true;//if is fissile
+        }
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return iaeaDefinitionExistsAndHasEnergyLevels;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return getIaea() !=null || iaeaDefinitionExistsAndHasEnergyLevels;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        //disembody
+        ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
+        for (EMDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
+            if (elementalStack.getDefinition().getType() == 1 || elementalStack.getDefinition().getType() == -1) {
+                //covers both quarks and antiquarks
+                decaysInto.add(elementalStack);
+            } else {
+                //covers both quarks and antiquarks
+                decaysInto.add(new EMDefinitionStack(boson_Y__, 2));
+            }
+        }
+        return new EMDecay[]{new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])), deadEnd};
+    }
+
+    //@Override
+    //public iElementalDefinition getAnti() {
+    //    cElementalDefinitionStack[] stacks = this.elementalStacks.values();
+    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
+    //    for (int i = 0; i < antiElements.length; i++) {
+    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
+    //    }
+    //    try {
+    //        return new dAtomDefinition(false, antiElements);
+    //    } catch (tElementalException e) {
+    //        if (DEBUG_MODE) e.printStackTrace();
+    //        return null;
+    //    }
+    //}
+
+    @Override
+    public EMAtomDefinition getAnti() {
+        EMDefinitionStackMap anti = new EMDefinitionStackMap();
+        for (EMDefinitionStack stack : elementalStacks.valuesToArray()) {
+            anti.putReplace(new EMDefinitionStack(stack.getDefinition().getAnti(), stack.getAmount()));
+        }
+        try {
+            return new EMAtomDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return EMTransformationInfo.TRANSFORMATION_INFO.getFluidDequantization().get(this);
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return EMTransformationInfo.TRANSFORMATION_INFO.getItemDequantization().get(this);
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return EMTransformationInfo.TRANSFORMATION_INFO.getOredictDequantization().get(this);
+    }
+
+    public EMNuclideIAEA getIaea() {
+        return iaea;
+    }
+
+    public byte getDecayMode() {
+        return decayMode;
+    }
+
+    public int getNeutralCount() {
+        return neutralCount;
+    }
+
+    public int getElement() {
+        return element;
+    }
+
+    private static final class Nomenclature {
+        private static final String[] SYMBOL = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
+        private static final String[] NAME = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+        private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
+    }
+
+    @Override
+    public NBTTagCompound toNBT() {
+        return getNbtTagCompound(nbtType, elementalStacks);
+    }
+
+    public static EMAtomDefinition fromNBT(NBTTagCompound nbt) {
+        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < stacks.length; i++) {
+            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+        }
+        try {
+            return new EMAtomDefinition(stacks);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    public static void run() {
+        for (Runnable r : overrides) {
+            r.run();
+        }
+
+        for(Map.Entry<EMAtomDefinition,Double> entry:lifetimeOverrides.entrySet()){
+            try {
+                lifetimeOverrides.put(new EMAtomDefinition(entry.getKey().elementalStacks), entry.getValue());
+            }catch (EMException e){
+                e.printStackTrace(); //Impossible
+            }
+        }
+
+        //populate stable isotopes
+        for (int element = 1; element < 83; element++)//Up to Bismuth exclusive
+        {
+            for (int isotope = 0; isotope < 130; isotope++) {
+                xstr.setSeed((long) (element + 1) * (isotope + 100));
+                //stability curve
+                int StableIsotope = stableIzoCurve(element);
+                int izoDiff = isotope - StableIsotope;
+                int izoDiffAbs = Math.abs(izoDiff);
+                double        rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                EMNuclideIAEA nuclide     = EMNuclideIAEA.get(element, isotope);
+                if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.getHalfTime() >= STABLE_RAW_LIFE_TIME) {
+                    TreeSet<Integer> isotopes = stableIsotopes.computeIfAbsent(element, k -> new TreeSet<>());
+                    isotopes.add(isotope);
+                }
+            }
+        }
+
+        //populate unstable isotopes
+        for (int element = 83; element < 150; element++) {
+            for (int isotope = 100; isotope < 180; isotope++) {
+                xstr.setSeed((long) (element + 1) * (isotope + 100));
+                //stability curve
+                int Isotope = stableIzoCurve(element);
+                int izoDiff = isotope - Isotope;
+                int izoDiffAbs = Math.abs(izoDiff);
+                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                TreeMap<Double, Integer> isotopes = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
+                isotopes.put(rawLifeTime, isotope);
+            }
+        }
+
+        try {
+            for (Map.Entry<Integer, TreeSet<Integer>> integerTreeSetEntry : stableIsotopes.entrySet()) {
+                stableAtoms.put(integerTreeSetEntry.getKey(), new EMAtomDefinition(
+                        new EMDefinitionStack(EMHadronDefinition.hadron_p, integerTreeSetEntry.getKey()),
+                        new EMDefinitionStack(EMHadronDefinition.hadron_n, integerTreeSetEntry.getValue().first()),
+                        new EMDefinitionStack(EMLeptonDefinition.lepton_e, integerTreeSetEntry.getKey())));
+                if (DEBUG_MODE) {
+                    TecTech.LOGGER.info("Added Stable Atom:" + integerTreeSetEntry.getKey() + ' ' + integerTreeSetEntry.getValue().first() + ' ' + stableAtoms.get(integerTreeSetEntry.getKey()).getMass());
+                }
+            }
+            for (Map.Entry<Integer, TreeMap<Double, Integer>> integerTreeMapEntry : mostStableUnstableIsotopes.entrySet()) {
+                unstableAtoms.put(integerTreeMapEntry.getKey(), new EMAtomDefinition(
+                        new EMDefinitionStack(EMHadronDefinition.hadron_p, integerTreeMapEntry.getKey()),
+                        new EMDefinitionStack(EMHadronDefinition.hadron_n, integerTreeMapEntry.getValue().lastEntry().getValue()),
+                        new EMDefinitionStack(EMLeptonDefinition.lepton_e, integerTreeMapEntry.getKey())));
+                if (DEBUG_MODE) {
+                    TecTech.LOGGER.info("Added Unstable Atom:" + integerTreeMapEntry.getKey() + ' ' + integerTreeMapEntry.getValue().lastEntry().getValue() + ' ' + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass());
+                }
+            }
+            deuterium=new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p1,
+                    EMHadronDefinition.hadron_n1,
+                    EMLeptonDefinition.lepton_e1).getStackForm(1);
+            tritium=new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p1,
+                    EMHadronDefinition.hadron_n2,
+                    EMLeptonDefinition.lepton_e1).getStackForm(1);
+            helium_3=new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p2,
+                    EMHadronDefinition.hadron_n1,
+                    EMLeptonDefinition.lepton_e2).getStackForm(1);
+            alpha = new EMAtomDefinition(
+                    EMHadronDefinition.hadron_p2,
+                    EMHadronDefinition.hadron_n2).getStackForm(1);
+            beryllium_8=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 4),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 4),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 4)).getStackForm(1);
+            carbon_14=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 6),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 8),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 6)).getStackForm(1);
+            neon_24=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 10),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 14),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 10)).getStackForm(1);
+            silicon_34=new EMAtomDefinition(
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 14),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 20),
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 14)).getStackForm(1);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMAtomDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)64);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + 64);
+        }
+    }
+
+    public static void setTransformation(){
+        /*----STABLE ATOMS----**/
+        refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
+
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
+        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
+        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
+        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
+
+        /*----UNSTABLE ATOMS----**/
+        refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
+
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
+        //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
+        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
+        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
+        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
+        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
+        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
+
+        try {
+            EMAtomDefinition temp;
+            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(deuterium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
+
+            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(tritium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
+
+            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(helium_3.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
+
+            temp=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
+
+            double tempMass=temp.getMass();
+
+            temp=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
+
+            TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
+
+            temp=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
+
+            somethingHeavy=new EMAtomDefinition(
+                    new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)
+            );
+            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
+
+            TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
+
+            TecTech.LOGGER.info("Neutron Mass: "+ EMHadronDefinition.hadron_n.getMass());
+
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+
+        if(Loader.isModLoaded(Reference.GTPLUSPLUS)) {
+            new GtppAtomLoader().run();
+        }
+    }
+
+    public static EMAtomDefinition getFirstStableIsotope(int element) {
+        return stableAtoms.get(element);
+    }
+
+    public static EMAtomDefinition getBestUnstableIsotope(int element) {
+        return unstableAtoms.get(element);
+    }
+
+    @Override
+    public byte getClassType() {
+        return 64;
+    }
+
+    public static byte getClassTypeStatic(){
+        return 64;
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+        }
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+ getLocalizedName());
+            lines.add("SYMBOL = "+getSymbol());
+        }
+        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){
+            for(int i = 1; i< getIaea().getEnergeticStatesArray().length; i++){
+                lines.add("E LEVEL "+i+" = "+ getIaea().getEnergeticStatesArray()[i].energy+" eV");
+            }
+        }
+        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    At current energy level");
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
new file mode 100644
index 0000000000..384087770f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -0,0 +1,520 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.*;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
+import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
+import com.github.technus.tectech.util.Util;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static gregtech.api.enums.OrePrefixes.dust;
+
+/**
+ * Created by danie_000 on 17.11.2016.
+ */
+public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
+    private final int hash;
+
+    private static final byte                           nbtType    = (byte) 'h';
+    //Helpers
+    public static final  Map<EMHadronDefinition,String> SYMBOL_MAP =new HashMap<>();
+    public static final  Map<EMHadronDefinition,String> NAME_MAP   =new HashMap<>();
+    public static        EMHadronDefinition             hadron_p, hadron_n, hadron_p_, hadron_n_;
+    public static EMDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3, hadron_p5;
+    private static double protonMass = 0D;
+    private static double neutronMass = 0D;
+    private static final double actualProtonMass=938272081.3D;
+    private static final double actualNeutronMass=939565413.3D;
+
+    //float-mass in eV/c^2
+    private final double mass;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    charge;
+    private final double rawLifeTime;
+    private final int    amount;
+    //generation max present inside - minus if contains any antiquark
+    private final byte   type;
+    //private final FluidStack fluidThing;
+    //private final ItemStack itemThing;
+
+    private final EMConstantStackMap quarkStacks;
+
+    public EMHadronDefinition(EMDefinitionStack... quarks) throws EMException {
+        this(true, new EMConstantStackMap(quarks));
+    }
+
+    private EMHadronDefinition(boolean check, EMDefinitionStack... quarks) throws EMException {
+        this(check, new EMConstantStackMap(quarks));
+    }
+
+    public EMHadronDefinition(EMConstantStackMap quarks) throws EMException {
+        this(true, quarks);
+    }
+
+    private EMHadronDefinition(boolean check, EMConstantStackMap quarks) throws EMException {
+        if (check && !canTheyBeTogether(quarks)) {
+            throw new EMException("Hadron Definition error");
+        }
+        quarkStacks = quarks;
+
+        int amount = 0;
+        int charge = 0;
+        int type = 0;
+        boolean containsAnti = false;
+        double mass = 0;
+        for (EMDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
+            amount += quarkStack.getAmount();
+            if((int) quarkStack.getAmount() != quarkStack.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            mass += quarkStack.getMass();
+            charge += quarkStack.getCharge();
+            type = Math.max(Math.abs(quarkStack.getDefinition().getType()), type);
+            if (quarkStack.getDefinition().getType() < 0) {
+                containsAnti = true;
+            }
+        }
+        this.amount = amount;
+        this.charge = charge;
+        this.type = containsAnti ? (byte) -type : (byte) type;
+        long mult = this.getAmount() * this.getAmount() * (this.getAmount() - 1);
+        mass = mass * 5.543D * mult;//yes it becomes heavier
+
+        if (mass == protonMass && this.getAmount() == 3) {
+            rawLifeTime = IEMDefinition.STABLE_RAW_LIFE_TIME;
+            mass=actualProtonMass;
+        } else if (mass == neutronMass && this.getAmount() == 3) {
+            rawLifeTime = 882D;
+            mass=actualNeutronMass;
+        } else {
+            if (this.getAmount() == 3) {
+                rawLifeTime = 1.34D / mass * Math.pow(9.81, charge);
+            } else if (this.getAmount() == 2) {
+                rawLifeTime = 1.21D / mass / Math.pow(19.80, charge);
+            } else {
+                rawLifeTime = 1.21D / mass / Math.pow(9.80, charge);
+            }
+        }
+        this.mass=mass;
+        hash=super.hashCode();
+    }
+
+    //public but u can just try{}catch(){} the constructor it still calls this method
+    private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
+        long amount = 0;
+        for (EMDefinitionStack quarks : stacks.valuesToArray()) {
+            if (!(quarks.getDefinition() instanceof EMQuarkDefinition)) {
+                return false;
+            }
+            if((int) quarks.getAmount() != quarks.getAmount()){
+                throw new ArithmeticException("Amount cannot be safely converted to int!");
+            }
+            amount += quarks.getAmount();
+        }
+        return amount >= 2 && amount <= 12;
+    }
+
+    @Override
+    public String getLocalizedName() {
+        StringBuilder name= new StringBuilder(getSimpleName());
+        name.append(':');
+        String sym= NAME_MAP.get(this);
+        if(sym!=null){
+            name.append(' ').append(sym);
+        }else {
+            for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
+                name.append(' ').append(quark.getDefinition().getSymbol()).append((int) quark.getAmount());
+            }
+        }
+        return name.toString();
+    }
+
+    private String getSimpleName() {
+        switch (getAmount()) {
+            case 2:
+                return "Meson";
+            case 3:
+                return "Baryon";
+            case 4:
+                return "Tetraquark";
+            case 5:
+                return "Pentaquark";
+            case 6:
+                return "Hexaquark";
+            default:
+                return "Hadron";
+        }
+    }
+
+    @Override
+    public String getSymbol() {
+        String sym=SYMBOL_MAP.get(this);
+        if(sym!=null){
+            return sym;
+        }else {
+            StringBuilder symbol = new StringBuilder(8);
+            for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
+                for (int i = 0; i < quark.getAmount(); i++) {
+                    symbol.append(quark.getDefinition().getSymbol());
+                }
+            }
+            return symbol.toString();
+        }
+    }
+
+    @Override
+    public String getShortSymbol() {
+        String sym=SYMBOL_MAP.get(this);
+        if(sym!=null){
+            return sym;
+        }else {
+            StringBuilder symbol = new StringBuilder(8);
+            for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
+                for (int i = 0; i < quark.getAmount(); i++) {
+                    symbol.append(quark.getDefinition().getShortSymbol());
+                }
+            }
+            return symbol.toString();
+        }
+    }
+
+    @Override
+    public byte getColor() {
+        return -7;
+    }
+
+    @Override
+    public EMConstantStackMap getSubParticles() {
+        return quarkStacks;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+            return EMDecay.NO_PRODUCT;
+        }
+        ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
+        for (EMDefinitionStack quarks : quarkStacks) {
+            if (quarks.getDefinition().getType() == 1 || quarks.getDefinition().getType() == -1) {
+                //covers both quarks and antiquarks
+                decaysInto.add(quarks);
+            } else {
+                //covers both quarks and antiquarks
+                decaysInto.add(new EMDefinitionStack(boson_Y__, 2));
+            }
+        }
+        return new EMDecay[]{
+                new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])),
+                EMBosonDefinition.deadEnd
+        };
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{new EMDecay(0.75D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
+        if (getAmount() == 2 && quarkStacks.length == 2 &&
+                quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() &&
+                quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+            return EMDecay.NO_PRODUCT;
+        } else if (getAmount() != 3) {
+            return new EMDecay[]{new EMDecay(0.95D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+        } else {
+            ArrayList<EMQuarkDefinition> newBaryon = new ArrayList<>();
+            IEMDefinition[]              Particles = new IEMDefinition[2];
+            for (EMDefinitionStack quarks : quarkStacks) {
+                for (int i = 0; i < quarks.getAmount(); i++) {
+                    newBaryon.add((EMQuarkDefinition) quarks.getDefinition());
+                }
+            }
+            //remove last
+            EMQuarkDefinition lastQuark = newBaryon.remove(2);
+
+            EMDefinitionStack[] decay;
+            if (Math.abs(lastQuark.getType()) > 1) {
+                decay = lastQuark.getDecayArray()[1].getOutputStacks().valuesToArray();
+            } else {
+                decay = lastQuark.getDecayArray()[2].getOutputStacks().valuesToArray();
+            }
+            newBaryon.add((EMQuarkDefinition) decay[0].getDefinition());
+            Particles[0] = decay[1].getDefinition();
+            Particles[1] = decay[2].getDefinition();
+
+            EMDefinitionStack[] contentOfBaryon = newBaryon.stream()
+                    .map(eQuarkDefinition -> new EMDefinitionStack(eQuarkDefinition,1))
+                    .toArray(EMDefinitionStack[]::new);
+
+            try {
+                return new EMDecay[]{
+                        new EMDecay(0.001D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__),
+                        new EMDecay(0.99D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
+                        EMBosonDefinition.deadEnd};
+            } catch (EMException e) {
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                }
+                return new EMDecay[]{EMBosonDefinition.deadEnd};
+            }
+        }
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return getRawLifeTime();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+
+    @Override
+    public byte getType() {
+        return type;
+    }
+
+    //@Override
+    //public iElementalDefinition getAnti() {
+    //    cElementalDefinitionStack[] stacks = this.quarkStacks.values();
+    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
+    //    for (int i = 0; i < antiElements.length; i++) {
+    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
+    //    }
+    //    try {
+    //        return new dHadronDefinition(false, antiElements);
+    //    } catch (tElementalException e) {
+    //        if (DEBUG_MODE) e.printStackTrace();
+    //        return null;
+    //    }
+    //}
+
+    @Override
+    public IEMDefinition getAnti() {
+        EMDefinitionStackMap anti = new EMDefinitionStackMap();
+        for (EMDefinitionStack stack : quarkStacks.valuesToArray()) {
+            anti.putReplace(new EMDefinitionStack(stack.getDefinition().getAnti(), stack.getAmount()));
+        }
+        try {
+            return new EMHadronDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public NBTTagCompound toNBT() {
+        return getNbtTagCompound(nbtType, quarkStacks);
+    }
+
+    public static EMHadronDefinition fromNBT(NBTTagCompound nbt) {
+        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
+        for (int i = 0; i < stacks.length; i++) {
+            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+        }
+        try {
+            return new EMHadronDefinition(stacks);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+    }
+
+    public static void run() {
+        try {
+            hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
+            protonMass = hadron_p.getMass();
+            //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
+            hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
+            SYMBOL_MAP.put(hadron_p,"p");
+            NAME_MAP.put(hadron_p,"Proton");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
+            hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
+            SYMBOL_MAP.put(hadron_p_,"~p");
+            NAME_MAP.put(hadron_p_,"Anti Proton");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
+            hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
+            neutronMass = hadron_n.getMass();
+            //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
+            hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
+            SYMBOL_MAP.put(hadron_n, "n");
+            NAME_MAP.put(hadron_n, "Neutron");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
+            hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
+            SYMBOL_MAP.put(hadron_n_,"~n");
+            NAME_MAP.put(hadron_n_,"Anti Neutron");
+            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n_);
+        } catch (EMException e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+            protonMass = -1;
+            neutronMass = -1;
+        }
+        hadron_p1 = new EMDefinitionStack(hadron_p, 1D);
+        hadron_n1 = new EMDefinitionStack(hadron_n, 1D);
+        hadron_p2 = new EMDefinitionStack(hadron_p, 2D);
+        hadron_n2 = new EMDefinitionStack(hadron_n, 2D);
+        hadron_p3 = new EMDefinitionStack(hadron_p, 3D);
+        hadron_n3 = new EMDefinitionStack(hadron_n, 3D);
+        hadron_p5 = new EMDefinitionStack(hadron_p, 5D);
+
+        try {
+            EMComplex.addCreatorFromNBT(nbtType, EMHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64);
+        } catch (Exception e) {
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            }
+        }
+        if(DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + -64);
+        }
+    }
+
+    public static void setTransformations(){
+        //Added to atom map, but should be in its own
+        EMDefinitionStack neutrons =new EMDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
+        TRANSFORMATION_INFO.getOredictDequantization().put(neutrons.getDefinition(),new EMOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
+        TRANSFORMATION_INFO.getOredictQuantization().put(
+                OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
+                new EMOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
+        );
+    }
+
+    @Override
+    public byte getClassType() {
+        return -64;
+    }
+
+    public static byte getClassTypeStatic(){
+        return -64;
+    }
+
+    @Override
+    public int hashCode() {
+        return hash;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+        }
+        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+getSimpleName());
+            //lines.add("SYMBOL = "+getSymbol());
+        }
+        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    "+"At current energy level");
+        }
+    }
+
+    public double getRawLifeTime() {
+        return rawLifeTime;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
new file mode 100644
index 0000000000..9a22f54941
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
@@ -0,0 +1,336 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.TreeMap;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.util.Util.splitButDifferent;
+
+public final class EMNuclideIAEA {
+    public static final double AMU_TO_EV_DIV_C_C=9.31494061E08D,MICRO_AMU_TO_EV_DIV_C_C=9.31494061E02D;
+
+    //Nuclide			 T1/2 	 T1/2 [s]	 Decay Modes		  ? 	 Q 	 Q?-	 Q?	 QEC	 Q?- n	 Sn	 Sp	 Binding/A	 Atomic Mass	 Mass Excess	 Discovery
+    //Abund. [mole fract.]		 BR [%]		[?N]	[barn]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[? AMU]	[keV]
+
+    //Z,N,symb,radius, unc, energy, unc, jp, half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quad , unc,Qb-,unc,Qb- n,unc,Qa, unc, Qec, unc,Sn,unc, Sp,unc,Binding/A,unc,atomic mass, unc, mass excess,unc,
+    //Z,N,symbol,energy , unc, jp,half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quadrupole , unc,
+    private static final HashMap<Integer, EMNuclideIAEA> NUCLIDES =new HashMap<>();
+
+    public static void run(){
+        String line="";
+
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("nuclides.csv")));
+            ArrayList<String[]> blockOfData=new ArrayList<>(4);
+            while((line=reader.readLine())!=null) {
+                String[] split= splitButDifferent(line,",");
+                if(split.length!=19) {
+                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclides database " + line);
+                }
+                if(!split[1].isEmpty() && !blockOfData.isEmpty()) {
+                    new EMNuclideIAEA(blockOfData.toArray(new String[blockOfData.size()][]));
+                    blockOfData.clear();
+                }
+                blockOfData.add(split);
+            }
+            if(!blockOfData.isEmpty()) {
+                new EMNuclideIAEA(blockOfData.toArray(new String[blockOfData.size()][]));
+                blockOfData.clear();
+            }
+            reader.close();
+        }catch (Exception e){
+            System.out.println(line);
+            e.printStackTrace();
+        }
+
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("nuclidesTable.csv")));
+            while((line=reader.readLine())!=null) {
+                String[] split= splitButDifferent(line,",");
+                if(split.length!=47) {
+                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclidesTable database " + line);
+                }
+                get(Integer.parseInt(split[0]),Integer.parseInt(split[1])).getMoreData(split);
+            }
+            reader.close();
+        }catch (Exception e){
+            System.out.println(line);
+            e.printStackTrace();
+        }
+
+        try {
+            BufferedReader reader = new BufferedReader(new InputStreamReader(EMNuclideIAEA.class.getResourceAsStream("energyLevels.csv")));
+            while((line=reader.readLine())!=null) {
+                String[] split= splitButDifferent(line,",");
+                if(split.length!=27) {
+                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA energyLevels database " + line);
+                }
+                new energeticState(split);
+            }
+            reader.close();
+        }catch (Exception e){
+            System.out.println(line);
+            e.printStackTrace();
+        }
+
+        for(EMNuclideIAEA nuclide:NUCLIDES.values()) {
+            nuclide.makeArrayOfEnergyStates();
+        }
+    }
+
+    public static EMNuclideIAEA get(int protons, int neutrons){
+        return NUCLIDES.get((protons<<16)+neutrons);
+    }
+
+    private final short N;
+    private final short Z;
+    private final double                         halfTime;//sec
+    private final double                         mass;//eV/c^2
+    private final short                          discovery;//year
+    private       TreeMap<Double,energeticState> energeticStates;
+    private       energeticState[]               energeticStatesArray;
+
+
+    private EMNuclideIAEA(String[][] rows){
+        N=Short.parseShort(rows[1][2]);
+        Z=Short.parseShort(rows[1][0]);
+        NUCLIDES.put(((int) getZ() <<16)+ getN(),this);
+
+        String[] parts = splitButDifferent(rows[0][16], "|");
+        double Mass=doubleOrNaN(parts[0],"mass");
+        if(!Double.isNaN(Mass)) {
+            //System.out.println("Mass =\t" + Mass+"\t"+(N+Z)+"\t"+N+"\t"+Z+"\t"+(Mass/(N+Z)));
+            mass = Mass* MICRO_AMU_TO_EV_DIV_C_C;
+        }
+        else {
+            mass = Double.NaN;
+        }
+
+        discovery=(short)doubleOrNaN(rows[0][18],"discovery");
+
+        if(rows[0][3].contains("STABLE")){
+            halfTime = STABLE_RAW_LIFE_TIME;
+        }else{
+            parts = splitButDifferent(rows[0][4], "|");
+            halfTime = doubleOrNaN(parts[0],"half life");
+        }
+    }
+
+    private void getMoreData(String[] cells){
+        //if(DEBUG_MODE) {
+        //    if (add(cells[14])) System.out.println(N + " " + Z);
+        //    if (add(cells[17])) System.out.println(N + " " + Z);
+        //    if (add(cells[20])) System.out.println(N + " " + Z);
+        //}
+        new energeticState(this, getHalfTime(), getDecaysFixed(
+                cells[14],
+                doubleOrNaN(cells[15],"chance1"),
+                cells[17],
+                doubleOrNaN(cells[18],"chance1"),
+                cells[20],
+                doubleOrNaN(cells[21],"chance1")));
+    }
+
+    private static final energeticState[] empty=new energeticState[0];
+    private void makeArrayOfEnergyStates(){
+        if(energeticStates==null || energeticStates.isEmpty()) {
+            setEnergeticStatesArray(empty);
+        } else {
+            setEnergeticStatesArray(energeticStates.values().toArray(new energeticState[0]));
+            double life= getHalfTime();
+            for (energeticState energeticState : getEnergeticStatesArray()) {
+                if(Double.isNaN(energeticState.Thalf)){
+                    energeticState.Thalf=life;
+                }else {
+                    life=energeticState.Thalf;
+                }
+            }
+        }
+    }
+
+    private double doubleOrNaN(String s, String name){
+        s=s.replaceAll("#","");
+        if(!s.isEmpty()) {
+            try {
+                double value=Double.parseDouble(s);
+                if(Double.isNaN(value)) {
+                    return Double.NaN;
+                }
+                return value != 0 ?value:Double.NaN;
+            } catch (Exception e) {
+                System.out.println("Invalid Value " + name + ' ' + getN() + ' ' + getZ() + ' ' + s);
+                e.printStackTrace();
+            }
+        }
+        return Double.NaN;
+    }
+
+    public short getN() {
+        return N;
+    }
+
+    public short getZ() {
+        return Z;
+    }
+
+    public double getHalfTime() {
+        return halfTime;
+    }
+
+    public double getMass() {
+        return mass;
+    }
+
+    public short getDiscovery() {
+        return discovery;
+    }
+
+    public energeticState[] getEnergeticStatesArray() {
+        return energeticStatesArray;
+    }
+
+    public void setEnergeticStatesArray(energeticState[] energeticStatesArray) {
+        this.energeticStatesArray = energeticStatesArray;
+    }
+
+    public static final class energeticState{
+        public final double energy;
+        public double Thalf;
+        public final iaeaDecay[] decaymodes;
+
+        private energeticState(EMNuclideIAEA nuclide, double Thalf, iaeaDecay[] decaymodes){
+            energy=0;
+            this.Thalf=Thalf;
+            this.decaymodes=decaymodes;
+            if(nuclide.energeticStates==null) {
+                nuclide.energeticStates = new TreeMap<>();
+            }
+            nuclide.energeticStates.put(energy,this);
+        }
+
+        private energeticState(String[] cells){
+            EMNuclideIAEA nuclide = get((int)doubleOrNaN(cells[0],"protons"),(int)doubleOrNaN(cells[1],"neutrons"));
+            if(nuclide==null) {
+                throw new Error("Missing nuclide " + (int) doubleOrNaN(cells[0], "protons") + ' ' + (int) doubleOrNaN(cells[1], "neutrons"));
+            }
+            energy =doubleOrNaN(cells[3],"energy level",nuclide)*1000D;//to eV
+            if(energy<0) {
+                throw new Error("Invalid energy " + nuclide.getN() + ' ' + nuclide.getZ() + ' ' + cells[3]);
+            }
+            Thalf =doubleOrNaN(cells[10],"half life",nuclide);
+            if(nuclide.energeticStates==null) {
+                new Exception("Should be initialized before doing this... "+ nuclide.getN() + ' ' + nuclide.getZ()).printStackTrace();
+                nuclide.energeticStates = new TreeMap<>();
+            }
+            nuclide.energeticStates.put(energy,this);
+            //if(DEBUG_MODE) {
+            //    if (add(cells[12])) System.out.println(nuclide.N + " " + nuclide.Z);
+            //    if (add(cells[15])) System.out.println(nuclide.N + " " + nuclide.Z);
+            //    if (add(cells[18])) System.out.println(nuclide.N + " " + nuclide.Z);
+            //}
+            decaymodes = getDecaysFixed(
+                    cells[12],
+                    doubleOrNaN(cells[13],"chance 1",nuclide),
+                    cells[15],
+                    doubleOrNaN(cells[16],"chance 2",nuclide),
+                    cells[18],
+                    doubleOrNaN(cells[19],"chance 3",nuclide));
+        }
+
+        private double doubleOrNaN(String s, String name){
+            return doubleOrNaN(s,name,null);
+        }
+
+        private double doubleOrNaN(String s, String name, EMNuclideIAEA nuclide){
+            s = s.replaceAll("#", "");
+            if (!s.isEmpty()) {
+                try {
+                    return Double.parseDouble(s);
+                } catch (Exception e) {
+                    if(nuclide==null){
+                        System.out.println("Invalid Value " + name + ' ' + s);
+                    }else {
+                        System.out.println("Invalid Value " + name + ' ' + nuclide.getN() + ' ' + nuclide.getZ() + ' ' + s);
+                    }
+                    e.printStackTrace();
+                }
+            }
+            return Double.NaN;
+        }
+    }
+
+    private static HashSet<String> decays=new HashSet<>();
+    private static boolean add(String s){
+        if(decays.add(s)){
+            System.out.println(s);
+            return true;
+        }
+        return false;
+    }
+
+    private static iaeaDecay[] getDecaysFixed(String decay1, double chance1,String decay2, double chance2,String decay3, double chance3){
+        boolean do1,do2,do3;
+        do1= !decay1.isEmpty() && !Double.isNaN(chance1);
+        do2= !decay2.isEmpty() && !Double.isNaN(chance2);
+        do3= !decay3.isEmpty() && !Double.isNaN(chance3);
+        TreeMap<Double,iaeaDecay> decays=new TreeMap<>();
+        if(do1 && do2 && chance1==100 && chance2==100 && chance3!=100){
+            decays.put(1D, new iaeaDecay(1D, decay1));
+            if(do3) {
+                chance3/=100d;
+                decays.put(chance3, new iaeaDecay(chance3, decay2));
+                chance2=1d-chance3;
+            }
+            chance2/=2d;
+            decays.put(chance2, new iaeaDecay(chance2, decay2));
+        }else if(do1 && chance1==100){
+            decays.put(1D, new iaeaDecay(1D, decay1));
+            if(do2) {
+                chance2/=100d;
+                decays.put(chance2, new iaeaDecay(chance2, decay2));
+            }
+            if(do3) {
+                chance3 /= 100d;
+                if(do2) {
+                    chance3 *= chance2;
+                }
+                decays.put(chance3, new iaeaDecay(chance3, decay3));
+            }
+        }else{
+            double normalization= (do1?chance1:0) + (do2?chance2:0) + (do3?chance3:0);
+            if(do1) {
+                chance1/=normalization;
+                decays.put(chance1, new iaeaDecay(chance1, decay1));
+            }
+            if(do2) {
+                chance2/=normalization;
+                decays.put(chance2, new iaeaDecay(chance2, decay2));
+            }
+            if(do3) {
+                chance3/=normalization;
+                decays.put(chance3, new iaeaDecay(chance3, decay3));
+            }
+            if(do1||do2||do3) {
+                decays.put(1D, iaeaDecay.DEAD_END);
+            }
+        }
+        //if(DEBUG_MODE){
+        //    System.out.println("INVALID SUM?\t"+normalization+"\t"+decay1+"\t"+chance1+"\t"+decay2+"\t"+chance2+"\t"+decay3+"\t"+chance3);
+        //}
+        return decays.values().toArray(new iaeaDecay[0]);
+    }
+
+    public static final class iaeaDecay{
+        public final double chance;
+        public final String decayName;
+        public static final iaeaDecay DEAD_END=new iaeaDecay(1D,"DEAD_END");
+        private iaeaDecay(double chance,String decayName){
+            this.chance=chance;
+            this.decayName=decayName;
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
deleted file mode 100644
index 291ec8fe6b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dAtomDefinition.java
+++ /dev/null
@@ -1,1678 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
-
-import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eNeutrinoDefinition;
-import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.util.XSTR;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Materials;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition.getNbtTagCompound;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.deadEnd;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
-import static gregtech.api.enums.OrePrefixes.dust;
-
-/**
- * Created by danie_000 on 18.11.2016.
- */
-public final class dAtomDefinition extends cElementalDefinition {
-    public static final long ATOM_COMPLEXITY_LIMIT=65536L;
-    private static final byte BYTE_OFFSET=32;
-
-    private final int hash;
-    public static double refMass, refUnstableMass;
-
-    private static final byte nbtType = (byte) 'a';
-    private static final Random xstr = new XSTR();//NEEDS SEPARATE!
-    private static Map<Integer, TreeSet<Integer>> stableIsotopes = new HashMap<>();
-    private static final Map<Integer, dAtomDefinition> stableAtoms = new HashMap<>();
-    private static Map<Integer, TreeMap<Double, Integer>> mostStableUnstableIsotopes = new HashMap<>();
-    private static final Map<Integer, dAtomDefinition> unstableAtoms = new HashMap<>();
-    private static cElementalDefinitionStack alpha,deuterium,tritium,helium_3,beryllium_8,carbon_14,neon_24,silicon_34;
-    private static final HashMap<dAtomDefinition,Double> lifetimeOverrides = new HashMap<>();
-
-    public final iaeaNuclide iaea;
-
-    private static dAtomDefinition somethingHeavy;
-    public static dAtomDefinition getSomethingHeavy() {
-        return somethingHeavy;
-    }
-
-    private static final ArrayList<Runnable> overrides = new ArrayList<>();
-    public static void addOverride(dAtomDefinition atom, double rawLifeTime){
-        lifetimeOverrides.put(atom,rawLifeTime);
-    }
-
-    //float-mass in eV/c^2
-    public final double mass;
-    //public final int charge;
-    public final int charge;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    public final int chargeLeptons;
-    private double rawLifeTime;
-    //generation max present inside - minus if contains any anti quark
-    public final byte type;
-
-    public final byte decayMode;//t neutron to proton+,0,f proton to neutron
-    //public final boolean stable;
-
-    public final int neutralCount;
-    public final int element;
-
-    private final boolean iaeaDefinitionExistsAndHasEnergyLevels;
-
-    private final cElementalConstantStackMap elementalStacks;
-
-    //stable is rawLifeTime>=10^9
-
-    public dAtomDefinition(cElementalDefinitionStack... things) throws tElementalException {
-        this(true, new cElementalConstantStackMap(things));
-    }
-
-    private dAtomDefinition(boolean check, cElementalDefinitionStack... things) throws tElementalException {
-        this(check, new cElementalConstantStackMap(things));
-    }
-
-    public dAtomDefinition(cElementalConstantStackMap things) throws tElementalException {
-        this(true, things);
-    }
-
-    private dAtomDefinition(boolean check, cElementalConstantStackMap things) throws tElementalException {
-        if (check && !canTheyBeTogether(things)) {
-            throw new tElementalException("Atom Definition error");
-        }
-        elementalStacks = things;
-
-        double mass = 0;
-        int cLeptons = 0;
-        int cNucleus = 0;
-        int neutralCount = 0, element = 0;
-        int type = 0;
-        boolean containsAnti = false;
-        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
-            iElementalDefinition def = stack.definition;
-            int amount = (int)stack.amount;
-            if((int)stack.amount!=stack.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            mass += stack.getMass();
-            if (def.getType() < 0) {
-                containsAnti = true;
-            }
-            type = Math.max(type, Math.abs(def.getType()));
-
-            if (def instanceof eLeptonDefinition) {
-                cLeptons += stack.getCharge();
-            } else {
-                cNucleus += stack.getCharge();
-                if (def.getCharge() == 3) {
-                    element += amount;
-                } else if (def.getCharge() == -3) {
-                    element -= amount;
-                } else if (def.getCharge() == 0) {
-                    neutralCount += amount;
-                }
-            }
-        }
-        this.type = containsAnti ? (byte) -type : (byte) type;
-        //this.mass = mass;
-        chargeLeptons = cLeptons;
-        charge = cNucleus + cLeptons;
-        this.neutralCount = neutralCount;
-        this.element = element;
-
-        element = Math.abs(element);
-
-        //stability curve
-        int StableIsotope = stableIzoCurve(element);
-        int izoDiff = neutralCount - StableIsotope;
-        int izoDiffAbs = Math.abs(izoDiff);
-
-        xstr.setSeed((element + 1L) * (neutralCount + 100L));
-        iaea =iaeaNuclide.get(element,neutralCount);
-        if(iaea!=null){
-            if(Double.isNaN(iaea.mass)) {
-                this.mass = mass;
-            } else {
-                this.mass = iaea.mass;
-            }
-
-            if(Double.isNaN(iaea.halfTime)) {
-                Double overriddenLifeTime= lifetimeOverrides.get(this);
-                double rawLifeTimeTemp;
-                if(overriddenLifeTime!=null) {
-                    rawLifeTimeTemp = overriddenLifeTime;
-                } else {
-                    rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
-                }
-                rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
-            }else {
-                rawLifeTime = containsAnti ? iaea.halfTime * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) : iaea.halfTime;
-            }
-            iaeaDefinitionExistsAndHasEnergyLevels =iaea.energeticStatesArray.length>1;
-        }else{
-            this.mass=mass;
-
-            Double overriddenLifeTime= lifetimeOverrides.get(this);
-            double rawLifeTimeTemp;
-            if(overriddenLifeTime!=null) {
-                rawLifeTimeTemp = overriddenLifeTime;
-            } else {
-                rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
-            }
-            rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
-
-            iaeaDefinitionExistsAndHasEnergyLevels =false;
-        }
-
-        if(iaea==null || iaea.energeticStatesArray[0].energy!=0) {
-            if (izoDiff == 0) {
-                decayMode = 0;
-            } else {
-                decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4);
-            }
-        }else{
-            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4)+ BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
-        }
-        //this.stable = this.rawLifeTime >= STABLE_RAW_LIFE_TIME;
-        hash=super.hashCode();
-    }
-
-    private static int stableIzoCurve(int element) {
-        return (int) Math.round(-1.19561E-06D * Math.pow(element, 4D) +
-                1.60885E-04D * Math.pow(element, 3D) +
-                3.76604E-04D * Math.pow(element, 2D) +
-                1.08418E+00D * (double) element);
-    }
-
-    private static double calculateLifeTime(int izoDiff, int izoDiffAbs, int element, int isotope, boolean containsAnti) {
-        double rawLifeTime;
-
-        if (element <= 83 && isotope < 127 && (izoDiffAbs == 0 || element == 1 && isotope == 0 || element == 2 && isotope == 1 || izoDiffAbs == 1 && element > 2 && element % 2 == 1 || izoDiffAbs == 3 && element > 30 && element % 2 == 0 || izoDiffAbs == 5 && element > 30 && element % 2 == 0 || izoDiffAbs == 2 && element > 20 && element % 2 == 1)) {
-            rawLifeTime = (1D + xstr.nextDouble() * 9D) * (containsAnti ? 2.381e4D : 1.5347e25D);
-        } else {
-            //Y = (X-A)/(B-A) * (D-C) + C
-            double unstabilityEXP;
-            if (element == 0) {
-                return 1e-35D;
-            } else if (element == 1) {
-                unstabilityEXP = 1.743D - Math.abs(izoDiff - 1) * 9.743D;
-            } else if (element == 2) {
-                switch (isotope) {
-                    case 4:
-                        unstabilityEXP = 1.61D;
-                        break;
-                    case 5:
-                        unstabilityEXP = -7.523D;
-                        break;
-                    case 6:
-                        unstabilityEXP = -1.51D;
-                        break;
-                    default:
-                        unstabilityEXP = -(izoDiffAbs * 6.165D);
-                        break;
-                }
-            } else if (element <= 83 || isotope <= 127 && element <= 120) {
-                double elementPow4 = Math.pow(element, 4);
-
-                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - Math.abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
-            } else if (element < 180) {
-                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - Math.abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
-            } else {
-                return -1;
-            }
-            if ((isotope == 127 || isotope == 128) && element < 120 && element > 83) {
-                unstabilityEXP -= 1.8D;
-            }
-            if (element > 83 && element < 93 && isotope % 2 == 0 && izoDiff == 3) {
-                unstabilityEXP += 6;
-            }
-            if (element > 93 && element < 103 && isotope % 2 == 0 && izoDiff == 4) {
-                unstabilityEXP += 6;
-            }
-            rawLifeTime = (containsAnti ? 1e-8D : 1) * Math.pow(10D, unstabilityEXP) * (1D + xstr.nextDouble() * 9D);
-        }
-
-        if (rawLifeTime < 8e-15D) {
-            return 1e-35D;
-        }
-        if (rawLifeTime > 8e28D) {
-            return 8e30D;
-        }
-        return rawLifeTime;
-    }
-
-    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
-        boolean nuclei = false;
-        long qty=0;
-        for (cElementalDefinitionStack stack : stacks.valuesToArray()) {
-            if (stack.definition instanceof dHadronDefinition) {
-                if (((dHadronDefinition) stack.definition).amount != 3) {
-                    return false;
-                }
-                nuclei = true;
-            } else if (!(stack.definition instanceof eLeptonDefinition)) {
-                return false;
-            }
-            if((int)stack.amount!=stack.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            qty+=stack.amount;
-        }
-        return nuclei && qty<ATOM_COMPLEXITY_LIMIT;
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    public int getChargeLeptons() {
-        return chargeLeptons;
-    }
-
-    public int getChargeHadrons() {
-        return charge - chargeLeptons;
-    }
-
-    public int getIonizationElementWise() {
-        return element * 3 + chargeLeptons;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        if(currentEnergy<=0) {
-            return rawLifeTime;
-        }
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            if(currentEnergy>=iaea.energeticStatesArray.length){
-                return iaea.energeticStatesArray[iaea.energeticStatesArray.length-1].Thalf/(currentEnergy-iaea.energeticStatesArray.length+1);
-            }
-            return iaea.energeticStatesArray[(int)currentEnergy].Thalf;
-        }
-        return rawLifeTime/(currentEnergy+1);
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-
-    @Override
-    public byte getColor() {
-        return -10;
-    }
-
-    @Override
-    public String getName() {
-        int element = Math.abs(this.element);
-        boolean negative = this.element < 0;
-        try {
-            if (Math.abs(type) != 1) {
-                return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
-            }
-            return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return (negative ? "Element: ~" : "Element: ") + element;
-        }
-    }
-
-    @Override
-    public String getSymbol() {
-        int element = Math.abs(this.element);
-        boolean negative = this.element < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + neutralCount + " I:" + (neutralCount+element) + " C:" + getCharge();
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + neutralCount + " I:" + (neutralCount+element) + " C:" + getCharge();
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "? N:" + neutralCount + " I:" + (neutralCount+element) + " C:" + getCharge();
-            }
-        }
-    }
-
-    @Override
-    public String getShortSymbol() {
-        int element = Math.abs(this.element);
-        boolean negative = this.element < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1];
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "?";
-            }
-        }
-    }
-
-    @Override
-    public cElementalConstantStackMap getSubParticles() {
-        return elementalStacks.clone();
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        ArrayList<cElementalDecay> decaysList=new ArrayList<>(4);
-        return getDecayArray(decaysList,decayMode,true);
-    }
-
-    private cElementalDecay[] getDecayArray(ArrayList<cElementalDecay> decaysList,int decayMode,boolean tryAnti) {//todo?
-        if (type == 1) {
-            switch (decayMode) {
-                case -2:
-                    if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    } else if(PbetaDecay(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case -1:
-                    if(Emmision(decaysList, dHadronDefinition.hadron_p1)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case 0:
-                    if(alphaDecay(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case 1:
-                    if(Emmision(decaysList, dHadronDefinition.hadron_n1)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                case 2:
-                    if(MbetaDecay(decaysList)) {
-                        return decaysList.toArray(cElementalDecay.noProduct);
-                    }
-                    break;
-                default:
-                    if(decayMode>8){
-                        if(iaeaDecay(decaysList,0)) {
-                            return decaysList.toArray(cElementalDecay.noProduct);
-                        }
-                        return getDecayArray(decaysList,decayMode- BYTE_OFFSET,false);
-                    }
-            }
-            return cElementalDecay.noDecay;
-        }else if(type ==-1){
-            dAtomDefinition anti=getAnti();
-            if(anti!=null) {
-                return anti.getDecayArray(decaysList, decayMode, false);
-            }
-        }
-        return getNaturalDecayInstant();
-    }
-
-    private boolean iaeaDecay(ArrayList<cElementalDecay> decaysList,long energy){
-        iaeaNuclide.energeticState state;
-        if(energy>iaea.energeticStatesArray.length) {
-            state = iaea.energeticStatesArray[iaea.energeticStatesArray.length - 1];
-        } else if(energy<=0) {
-            state = iaea.energeticStatesArray[0];
-        } else {
-            state = iaea.energeticStatesArray[(int) energy];
-        }
-        for (int i=0;i<state.decaymodes.length;i++){
-            if(!getDecayFromIaea(decaysList,state.decaymodes[i],energy)) {
-                decaysList.clear();
-                return false;
-            }
-        }
-        return !decaysList.isEmpty();
-    }
-
-    private boolean getDecayFromIaea(ArrayList<cElementalDecay> decaysList, iaeaNuclide.iaeaDecay decay, long energy){
-        cElementalDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new cElementalDefinitionStackMap();
-        switch (decay.decayName){
-            case "D": {
-                if (withThis.removeAllAmounts(false, deuterium.definition.getSubParticles())){
-                    withThis.putReplace(deuterium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "3H": {
-                if (withThis.removeAllAmounts(false, tritium.definition.getSubParticles())){
-                    withThis.putReplace(tritium);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "3HE": {
-                if (withThis.removeAllAmounts(false, helium_3.definition.getSubParticles())){
-                    withThis.putReplace(helium_3);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "8BE": {
-                if (withThis.removeAllAmounts(false, beryllium_8.definition.getSubParticles())){
-                    withThis.putReplace(beryllium_8);
-                    decaysList.add(new cElementalDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                    return true;
-                }
-            } break;
-            case "14C": {
-                if (withThis.removeAllAmounts(false, carbon_14.definition.getSubParticles())){
-                    newStuff.putReplace(carbon_14);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "24NE": {
-                if (withThis.removeAllAmounts(false, neon_24.definition.getSubParticles())){
-                    newStuff.putReplace(neon_24);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "34SI": {
-                if (withThis.removeAllAmounts(false, silicon_34.definition.getSubParticles())){
-                    newStuff.putReplace(silicon_34);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "A": case "A?": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2,dHadronDefinition.hadron_p2)){
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_2);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2B-": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
-                    withThis.putUnify(dHadronDefinition.hadron_p2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e2);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "EC": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2EC": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B++EC": case "EC+B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+A": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p3, dHadronDefinition.hadron_n1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B+2P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p3)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-A": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n3, dHadronDefinition.hadron_p1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(dHadronDefinition.hadron_n1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-2N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n3)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(dHadronDefinition.hadron_n2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "B-P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECA": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1,eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p3)){
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(alpha);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECP": {
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p2)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "EC2P": {
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1,dHadronDefinition.hadron_p3)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(dHadronDefinition.hadron_p2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECP+EC2P": {//todo look at branching ratios
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e2,dHadronDefinition.hadron_p5)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    newStuff.putReplace(dHadronDefinition.hadron_p3);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    newStuff.putReplace(dHadronDefinition.hadron_n1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2N": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n2)){
-                    newStuff.putReplace(dHadronDefinition.hadron_n2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1)){
-                    newStuff.putReplace(dHadronDefinition.hadron_p1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "2P": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2)){
-                    newStuff.putReplace(dHadronDefinition.hadron_p2);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "SF": {
-                if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
-                    return true;
-                }
-            } break;
-            case "B-F": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_n1)){
-                    withThis.putUnify(dHadronDefinition.hadron_p1);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "ECF": case "ECSF": case "EC(+SF)": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "SF(+EC+B+)": case "SF+EC+B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "SF+EC+B-": {
-                if (withThis.removeAllAmounts(false, eLeptonDefinition.lepton_e1)){
-                    newStuff.putReplace(eLeptonDefinition.lepton_e1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
-                            return true;
-                        }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "IT": case "IT?": case "G": {
-                if(energy>0){
-                    decaysList.add(new cElementalDecay(decay.chance, this, boson_Y__));
-                }else{
-                    if(DEBUG_MODE) {
-                        TecTech.LOGGER.info("Tried to emit Gamma from ground state");
-                    }
-                    decaysList.add(new cElementalDecay(decay.chance, this));
-                }
-                return true;
-            } //break;
-            case "IT+EC+B+": {
-                if (withThis.removeAllAmounts(false, dHadronDefinition.hadron_p2,eLeptonDefinition.lepton_e1)){
-                    withThis.putUnify(dHadronDefinition.hadron_n2);
-                    newStuff.putReplace(eLeptonDefinition.lepton_e_1);
-                    newStuff.putReplace(eNeutrinoDefinition.lepton_Ve2);
-                    newStuff.putReplace(eBosonDefinition.boson_Y__1);
-                    try{
-                        newStuff.putReplace(new dAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new cElementalDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-                        return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } break;
-            case "DEAD_END":
-                decaysList.add(deadEnd);
-                return true;
-            default: throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + neutralCount+ ' ' +element);
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Failed to decay " + element + ' ' + neutralCount + ' ' + decay.decayName);
-        }
-        return false;
-    }
-
-    private boolean Emmision(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStack emit) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAmount(false, emit)) {
-            try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), emit));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean alphaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAllAmounts(false, alpha.definition.getSubParticles())) {
-            try {
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), alpha));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean MbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAmount(false, dHadronDefinition.hadron_n1)) {
-            try {
-                tree.putUnify(dHadronDefinition.hadron_p1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e1, eNeutrinoDefinition.lepton_Ve_1));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean PbetaDecay(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAmount(false, dHadronDefinition.hadron_p1)) {
-            try {
-                tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eLeptonDefinition.lepton_e_1, eNeutrinoDefinition.lepton_Ve1));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean ElectronCapture(ArrayList<cElementalDecay> decaysList) {
-        cElementalDefinitionStackMap tree = elementalStacks.toMutable();
-        if (tree.removeAllAmounts(false, dHadronDefinition.hadron_p1,eLeptonDefinition.lepton_e1)) {
-            try {
-                tree.putUnify(dHadronDefinition.hadron_n1);
-                decaysList.add(new cElementalDecay(1, new cElementalDefinitionStack(new dAtomDefinition(tree.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1), eNeutrinoDefinition.lepton_Ve1));
-                return true;
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return false;
-    }
-
-    private boolean Fission(ArrayList<cElementalDecay> decaysList, cElementalDefinitionStackMap fissile, cElementalDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
-        cElementalDefinitionStackMap heavy      = new cElementalDefinitionStackMap();
-        double[]                     liquidDrop = liquidDropFunction(Math.abs(element)<=97);
-
-        for(cElementalDefinitionStack stack: fissile.valuesToArray()){
-            if(spontaneousCheck && stack.definition instanceof dHadronDefinition &&
-                    (stack.amount<=80 || stack.amount<90 && XSTR_INSTANCE.nextInt(10)<stack.amount-80)) {
-                return false;
-            }
-            if(stack.definition.getCharge()==0){
-                //if(stack.definition instanceof dHadronDefinition){
-                    double neutrals=stack.amount*liquidDrop[2];
-                    int neutrals_cnt=(int)Math.floor(neutrals);
-                    neutrals_cnt+=neutrals-neutrals_cnt>XSTR_INSTANCE.nextDouble()?1:0;
-                    particles.putUnify(new cElementalDefinitionStack(stack.definition, neutrals_cnt));
-
-                    int heavy_cnt=(int)Math.ceil(stack.amount*liquidDrop[1]);
-                    while(heavy_cnt+neutrals_cnt>stack.amount) {
-                        heavy_cnt--;
-                    }
-                    fissile.removeAmount(false,new cElementalDefinitionStack(stack.definition,heavy_cnt+neutrals_cnt));
-                    heavy.putReplace(new cElementalDefinitionStack(stack.definition, heavy_cnt));
-                //}else{
-                //    particles.add(stack);
-                //    light.remove(stack.definition);
-                //}
-            }else{
-                int heavy_cnt=(int)Math.ceil(stack.amount*liquidDrop[0]);
-                if(heavy_cnt%2==1 && XSTR_INSTANCE.nextDouble()>0.05D) {
-                    heavy_cnt--;
-                }
-                cElementalDefinitionStack new_stack=new cElementalDefinitionStack(stack.definition, heavy_cnt);
-                fissile.removeAmount(false,new_stack);
-                heavy.putReplace(new_stack);
-            }
-        }
-
-        try {
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
-            particles.putReplace(new cElementalDefinitionStack(new dAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
-            decaysList.add(new cElementalDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
-            return true;
-        } catch (Exception e) {
-            if(DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        return false;
-    }
-
-    private static double[] liquidDropFunction(boolean asymmetric) {
-        double[] out = new double[3];
-
-        out[0] = XSTR_INSTANCE.nextGaussian();
-
-        if (out[0] < 1 && out[0] >= -1) {
-            if (XSTR_INSTANCE.nextBoolean()) {
-                out[0] = XSTR_INSTANCE.nextDouble() * 2d - 1d;
-            }
-        }
-
-        if (asymmetric && out[0] > XSTR_INSTANCE.nextDouble() && XSTR_INSTANCE.nextInt(4) == 0) {
-            out[0] = -out[0];
-        }
-
-        //scale to splitting ratio
-        out[0] = out[0] * 0.05d + .6d;
-
-        if (out[0] < 0 || out[0] > 1) {
-            return liquidDropFunction(asymmetric);
-        }
-        if (out[0] < .5d) {
-            out[0] = 1d - out[0];
-        }
-
-        //extra neutrals
-        out[2] = 0.012d + XSTR_INSTANCE.nextDouble() * 0.01d;
-
-        if (asymmetric) {
-            out[1] = out[0];
-        } else {
-            out[1] = out[0] - out[2] * .5d;
-        }
-
-        return out;
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        if (iaeaDefinitionExistsAndHasEnergyLevels) {
-            ArrayList<cElementalDecay> decays=new ArrayList<>(4);
-            if(iaeaDecay(decays,energyLevel)){
-                return decays.toArray(cElementalDecay.noProduct);
-            }
-        }
-        if(energyLevel< Math.abs(charge)/3+neutralCount) {
-            return new cElementalDecay[]{new cElementalDecay(1, this, boson_Y__)};
-        }
-        return getNaturalDecayInstant();
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel,long newEnergyLevel) {
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            double result=0;
-            boolean backwards=newEnergyLevel<currentEnergyLevel;
-            if(backwards){
-                long temp=currentEnergyLevel;
-                currentEnergyLevel=newEnergyLevel;
-                newEnergyLevel=temp;
-            }
-
-            if(currentEnergyLevel<=0){
-                if(newEnergyLevel<=0) {
-                    return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
-                } else {
-                    result += iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * -currentEnergyLevel;
-                }
-            }else {
-                result -= iaea.energeticStatesArray[(int) Math.min(iaea.energeticStatesArray.length - 1, currentEnergyLevel)].energy;
-            }
-            if(newEnergyLevel>=iaea.energeticStatesArray.length){
-                if(currentEnergyLevel>=iaea.energeticStatesArray.length) {
-                    return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
-                } else {
-                    result += iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - iaea.energeticStatesArray.length + 1);
-                }
-                result+=iaea.energeticStatesArray[iaea.energeticStatesArray.length-1].energy;
-            }else {
-                result += iaea.energeticStatesArray[(int) Math.max(0, newEnergyLevel)].energy;
-            }
-
-            return backwards?-result:result;
-        }
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return iaeaDefinitionExistsAndHasEnergyLevels;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        if(!iaeaDefinitionExistsAndHasEnergyLevels) return false;
-        iaeaNuclide.energeticState state;
-        if(energyLevel>iaea.energeticStatesArray.length) {
-            state = iaea.energeticStatesArray[iaea.energeticStatesArray.length - 1];
-        } else if(energyLevel<=0) {
-            state = iaea.energeticStatesArray[0];
-        } else {
-            state = iaea.energeticStatesArray[(int) energyLevel];
-        }
-        for (iaeaNuclide.iaeaDecay decay:state.decaymodes){
-            if(decay.decayName.contains("F")) return true;//if is fissile
-        }
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return iaeaDefinitionExistsAndHasEnergyLevels;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return iaea!=null || iaeaDefinitionExistsAndHasEnergyLevels;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        //disembody
-        ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<>();
-        for (cElementalDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
-            if (elementalStack.definition.getType() == 1 || elementalStack.definition.getType() == -1) {
-                //covers both quarks and antiquarks
-                decaysInto.add(elementalStack);
-            } else {
-                //covers both quarks and antiquarks
-                decaysInto.add(new cElementalDefinitionStack(boson_Y__, 2));
-            }
-        }
-        return new cElementalDecay[]{new cElementalDecay(0.75D, decaysInto.toArray(new cElementalDefinitionStack[0])), deadEnd};
-    }
-
-    //@Override
-    //public iElementalDefinition getAnti() {
-    //    cElementalDefinitionStack[] stacks = this.elementalStacks.values();
-    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
-    //    for (int i = 0; i < antiElements.length; i++) {
-    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
-    //    }
-    //    try {
-    //        return new dAtomDefinition(false, antiElements);
-    //    } catch (tElementalException e) {
-    //        if (DEBUG_MODE) e.printStackTrace();
-    //        return null;
-    //    }
-    //}
-
-    @Override
-    public dAtomDefinition getAnti() {
-        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
-        for (cElementalDefinitionStack stack : elementalStacks.valuesToArray()) {
-            anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
-        }
-        try {
-            return new dAtomDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return bTransformationInfo.TRANSFORMATION_INFO.fluidDequantization.get(this);
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return bTransformationInfo.TRANSFORMATION_INFO.itemDequantization.get(this);
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return bTransformationInfo.TRANSFORMATION_INFO.oredictDequantization.get(this);
-    }
-
-    private static final class Nomenclature {
-        private static final String[] SYMBOL = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
-        private static final String[] NAME = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
-        private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
-    }
-
-    @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, elementalStacks);
-    }
-
-    public static dAtomDefinition fromNBT(NBTTagCompound nbt) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new dAtomDefinition(stacks);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    public static void run() {
-        for (Runnable r : overrides) {
-            r.run();
-        }
-
-        for(Map.Entry<dAtomDefinition,Double> entry:lifetimeOverrides.entrySet()){
-            try {
-                lifetimeOverrides.put(new dAtomDefinition(entry.getKey().elementalStacks), entry.getValue());
-            }catch (tElementalException e){
-                e.printStackTrace(); //Impossible
-            }
-        }
-
-        //populate stable isotopes
-        for (int element = 1; element < 83; element++)//Up to Bismuth exclusive
-        {
-            for (int isotope = 0; isotope < 130; isotope++) {
-                xstr.setSeed((long) (element + 1) * (isotope + 100));
-                //stability curve
-                int StableIsotope = stableIzoCurve(element);
-                int izoDiff = isotope - StableIsotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                iaeaNuclide nuclide = iaeaNuclide.get(element, isotope);
-                if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.halfTime >= STABLE_RAW_LIFE_TIME) {
-                    TreeSet<Integer> isotopes = stableIsotopes.computeIfAbsent(element, k -> new TreeSet<>());
-                    isotopes.add(isotope);
-                }
-            }
-        }
-
-        //populate unstable isotopes
-        for (int element = 83; element < 150; element++) {
-            for (int isotope = 100; isotope < 180; isotope++) {
-                xstr.setSeed((long) (element + 1) * (isotope + 100));
-                //stability curve
-                int Isotope = stableIzoCurve(element);
-                int izoDiff = isotope - Isotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                TreeMap<Double, Integer> isotopes = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
-                isotopes.put(rawLifeTime, isotope);
-            }
-        }
-
-        try {
-            for (Map.Entry<Integer, TreeSet<Integer>> integerTreeSetEntry : stableIsotopes.entrySet()) {
-                stableAtoms.put(integerTreeSetEntry.getKey(), new dAtomDefinition(
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_p, integerTreeSetEntry.getKey()),
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_n, integerTreeSetEntry.getValue().first()),
-                        new cElementalDefinitionStack(eLeptonDefinition.lepton_e, integerTreeSetEntry.getKey())));
-                if (DEBUG_MODE) {
-                    TecTech.LOGGER.info("Added Stable Atom:" + integerTreeSetEntry.getKey() + ' ' + integerTreeSetEntry.getValue().first() + ' ' + stableAtoms.get(integerTreeSetEntry.getKey()).getMass());
-                }
-            }
-            for (Map.Entry<Integer, TreeMap<Double, Integer>> integerTreeMapEntry : mostStableUnstableIsotopes.entrySet()) {
-                unstableAtoms.put(integerTreeMapEntry.getKey(), new dAtomDefinition(
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_p, integerTreeMapEntry.getKey()),
-                        new cElementalDefinitionStack(dHadronDefinition.hadron_n, integerTreeMapEntry.getValue().lastEntry().getValue()),
-                        new cElementalDefinitionStack(eLeptonDefinition.lepton_e, integerTreeMapEntry.getKey())));
-                if (DEBUG_MODE) {
-                    TecTech.LOGGER.info("Added Unstable Atom:" + integerTreeMapEntry.getKey() + ' ' + integerTreeMapEntry.getValue().lastEntry().getValue() + ' ' + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass());
-                }
-            }
-            deuterium=new dAtomDefinition(
-                    dHadronDefinition.hadron_p1,
-                    dHadronDefinition.hadron_n1,
-                    eLeptonDefinition.lepton_e1).getStackForm(1);
-            tritium=new dAtomDefinition(
-                    dHadronDefinition.hadron_p1,
-                    dHadronDefinition.hadron_n2,
-                    eLeptonDefinition.lepton_e1).getStackForm(1);
-            helium_3=new dAtomDefinition(
-                    dHadronDefinition.hadron_p2,
-                    dHadronDefinition.hadron_n1,
-                    eLeptonDefinition.lepton_e2).getStackForm(1);
-            alpha = new dAtomDefinition(
-                    dHadronDefinition.hadron_p2,
-                    dHadronDefinition.hadron_n2).getStackForm(1);
-            beryllium_8=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 4),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 4),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 4)).getStackForm(1);
-            carbon_14=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 6),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 8),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 6)).getStackForm(1);
-            neon_24=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 10),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 14),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 10)).getStackForm(1);
-            silicon_34=new dAtomDefinition(
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 14),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 20),
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 14)).getStackForm(1);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, dAtomDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)64);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + 64);
-        }
-    }
-
-    public static void setTransformation(){
-        /*----STABLE ATOMS----**/
-        refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
-
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
-
-        /*----UNSTABLE ATOMS----**/
-        refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
-
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
-        bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
-        bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
-
-        try {
-            dAtomDefinition temp;
-            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(deuterium.definition, AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
-
-            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(tritium.definition, AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
-
-            bTransformationInfo.TRANSFORMATION_INFO.addFluid(new cElementalDefinitionStack(helium_3.definition, AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
-
-            temp=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 146)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
-
-            double tempMass=temp.getMass();
-
-            temp=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 92),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 143)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
-
-            TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
-
-            temp=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 145)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
-
-            somethingHeavy=new dAtomDefinition(
-                    new cElementalDefinitionStack(eLeptonDefinition.lepton_e, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_p, 94),
-                    new cElementalDefinitionStack(dHadronDefinition.hadron_n, 147)
-            );
-            bTransformationInfo.TRANSFORMATION_INFO.addOredict(new cElementalDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
-
-            TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
-
-            TecTech.LOGGER.info("Neutron Mass: "+dHadronDefinition.hadron_n.getMass());
-
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-
-        if(Loader.isModLoaded(Reference.GTPLUSPLUS)) {
-            new GtppAtomLoader().run();
-        }
-    }
-
-    public static dAtomDefinition getFirstStableIsotope(int element) {
-        return stableAtoms.get(element);
-    }
-
-    public static dAtomDefinition getBestUnstableIsotope(int element) {
-        return unstableAtoms.get(element);
-    }
-
-    @Override
-    public byte getClassType() {
-        return 64;
-    }
-
-    public static byte getClassTypeStatic(){
-        return 64;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getName());
-            lines.add("SYMBOL = "+getSymbol());
-        }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){
-            for(int i=1;i<iaea.energeticStatesArray.length;i++){
-                lines.add("E LEVEL "+i+" = "+iaea.energeticStatesArray[i].energy+" eV");
-            }
-        }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    At current energy level");
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
deleted file mode 100644
index aa0951d98c..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/dHadronDefinition.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.*;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
-import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
-import com.github.technus.tectech.util.Util;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition.getNbtTagCompound;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static gregtech.api.enums.OrePrefixes.dust;
-
-/**
- * Created by danie_000 on 17.11.2016.
- */
-public final class dHadronDefinition extends cElementalDefinition {//TODO Optimize map i/o
-    private final int hash;
-
-    private static final byte nbtType = (byte) 'h';
-    //Helpers
-    public static final Map<dHadronDefinition,String> SYMBOL_MAP =new HashMap<>();
-    public static final Map<dHadronDefinition,String> NAME_MAP =new HashMap<>();
-    public static dHadronDefinition hadron_p, hadron_n, hadron_p_, hadron_n_;
-    public static cElementalDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3, hadron_p5;
-    private static double protonMass = 0D;
-    private static double neutronMass = 0D;
-    private static final double actualProtonMass=938272081.3D;
-    private static final double actualNeutronMass=939565413.3D;
-
-    //float-mass in eV/c^2
-    public final double mass;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    public final int charge;
-    public final double rawLifeTime;
-    public final int amount;
-    //generation max present inside - minus if contains any antiquark
-    public final byte type;
-    //private final FluidStack fluidThing;
-    //private final ItemStack itemThing;
-
-    private final cElementalConstantStackMap quarkStacks;
-
-    public dHadronDefinition(cElementalDefinitionStack... quarks) throws tElementalException {
-        this(true, new cElementalConstantStackMap(quarks));
-    }
-
-    private dHadronDefinition(boolean check, cElementalDefinitionStack... quarks) throws tElementalException {
-        this(check, new cElementalConstantStackMap(quarks));
-    }
-
-    public dHadronDefinition(cElementalConstantStackMap quarks) throws tElementalException {
-        this(true, quarks);
-    }
-
-    private dHadronDefinition(boolean check, cElementalConstantStackMap quarks) throws tElementalException {
-        if (check && !canTheyBeTogether(quarks)) {
-            throw new tElementalException("Hadron Definition error");
-        }
-        quarkStacks = quarks;
-
-        int amount = 0;
-        int charge = 0;
-        int type = 0;
-        boolean containsAnti = false;
-        double mass = 0;
-        for (cElementalDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
-            amount += quarkStack.amount;
-            if((int)quarkStack.amount!=quarkStack.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            mass += quarkStack.getMass();
-            charge += quarkStack.getCharge();
-            type = Math.max(Math.abs(quarkStack.definition.getType()), type);
-            if (quarkStack.definition.getType() < 0) {
-                containsAnti = true;
-            }
-        }
-        this.amount = amount;
-        this.charge = charge;
-        this.type = containsAnti ? (byte) -type : (byte) type;
-        long mult = this.amount * this.amount * (this.amount - 1);
-        mass = mass * 5.543D * mult;//yes it becomes heavier
-
-        if (mass == protonMass && this.amount == 3) {
-            rawLifeTime = iElementalDefinition.STABLE_RAW_LIFE_TIME;
-            mass=actualProtonMass;
-        } else if (mass == neutronMass && this.amount == 3) {
-            rawLifeTime = 882D;
-            mass=actualNeutronMass;
-        } else {
-            if (this.amount == 3) {
-                rawLifeTime = 1.34D / mass * Math.pow(9.81, charge);
-            } else if (this.amount == 2) {
-                rawLifeTime = 1.21D / mass / Math.pow(19.80, charge);
-            } else {
-                rawLifeTime = 1.21D / mass / Math.pow(9.80, charge);
-            }
-        }
-        this.mass=mass;
-        hash=super.hashCode();
-    }
-
-    //public but u can just try{}catch(){} the constructor it still calls this method
-    private static boolean canTheyBeTogether(cElementalConstantStackMap stacks) {
-        long amount = 0;
-        for (cElementalDefinitionStack quarks : stacks.valuesToArray()) {
-            if (!(quarks.definition instanceof eQuarkDefinition)) {
-                return false;
-            }
-            if((int)quarks.amount!=quarks.amount){
-                throw new ArithmeticException("Amount cannot be safely converted to int!");
-            }
-            amount += quarks.amount;
-        }
-        return amount >= 2 && amount <= 12;
-    }
-
-    @Override
-    public String getName() {
-        StringBuilder name= new StringBuilder(getSimpleName());
-        name.append(':');
-        String sym= NAME_MAP.get(this);
-        if(sym!=null){
-            name.append(' ').append(sym);
-        }else {
-            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
-                name.append(' ').append(quark.definition.getSymbol()).append((int)quark.amount);
-            }
-        }
-        return name.toString();
-    }
-
-    private String getSimpleName() {
-        switch (amount) {
-            case 2:
-                return "Meson";
-            case 3:
-                return "Baryon";
-            case 4:
-                return "Tetraquark";
-            case 5:
-                return "Pentaquark";
-            case 6:
-                return "Hexaquark";
-            default:
-                return "Hadron";
-        }
-    }
-
-    @Override
-    public String getSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
-            return sym;
-        }else {
-            StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
-                for (int i = 0; i < quark.amount; i++) {
-                    symbol.append(quark.definition.getSymbol());
-                }
-            }
-            return symbol.toString();
-        }
-    }
-
-    @Override
-    public String getShortSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
-            return sym;
-        }else {
-            StringBuilder symbol = new StringBuilder(8);
-            for (cElementalDefinitionStack quark : quarkStacks.valuesToArray()) {
-                for (int i = 0; i < quark.amount; i++) {
-                    symbol.append(quark.definition.getShortSymbol());
-                }
-            }
-            return symbol.toString();
-        }
-    }
-
-    @Override
-    public byte getColor() {
-        return -7;
-    }
-
-    @Override
-    public cElementalConstantStackMap getSubParticles() {
-        return quarkStacks;
-    }
-
-    @Override
-    public cElementalDecay[] getNaturalDecayInstant() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
-            return cElementalDecay.noProduct;
-        }
-        ArrayList<cElementalDefinitionStack> decaysInto = new ArrayList<>();
-        for (cElementalDefinitionStack quarks : quarkStacks) {
-            if (quarks.definition.getType() == 1 || quarks.definition.getType() == -1) {
-                //covers both quarks and antiquarks
-                decaysInto.add(quarks);
-            } else {
-                //covers both quarks and antiquarks
-                decaysInto.add(new cElementalDefinitionStack(boson_Y__, 2));
-            }
-        }
-        return new cElementalDecay[]{
-                new cElementalDecay(0.75D, decaysInto.toArray(new cElementalDefinitionStack[0])),
-                eBosonDefinition.deadEnd
-        };
-    }
-
-    @Override
-    public cElementalDecay[] getEnergyInducedDecay(long energyLevel) {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (amount == 2 && quarkStacks.length == 2 && quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() && quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
-            return cElementalDecay.noProduct;
-        }
-        return new cElementalDecay[]{new cElementalDecay(0.75D, quarkStacks), eBosonDefinition.deadEnd}; //decay into quarks
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public cElementalDecay[] getDecayArray() {
-        cElementalDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (amount == 2 && quarkStacks.length == 2 &&
-                quarkStacks[0].definition.getMass() == quarkStacks[1].definition.getMass() &&
-                quarkStacks[0].definition.getType() == -quarkStacks[1].definition.getType()) {
-            return cElementalDecay.noProduct;
-        } else if (amount != 3) {
-            return new cElementalDecay[]{new cElementalDecay(0.95D, quarkStacks), eBosonDefinition.deadEnd}; //decay into quarks
-        } else {
-            ArrayList<eQuarkDefinition> newBaryon = new ArrayList<>();
-            iElementalDefinition[] Particles = new iElementalDefinition[2];
-            for (cElementalDefinitionStack quarks : quarkStacks) {
-                for (int i = 0; i < quarks.amount; i++) {
-                    newBaryon.add((eQuarkDefinition) quarks.definition);
-                }
-            }
-            //remove last
-            eQuarkDefinition lastQuark = newBaryon.remove(2);
-
-            cElementalDefinitionStack[] decay;
-            if (Math.abs(lastQuark.getType()) > 1) {
-                decay = lastQuark.getDecayArray()[1].outputStacks.valuesToArray();
-            } else {
-                decay = lastQuark.getDecayArray()[2].outputStacks.valuesToArray();
-            }
-            newBaryon.add((eQuarkDefinition) decay[0].definition);
-            Particles[0] = decay[1].definition;
-            Particles[1] = decay[2].definition;
-
-            cElementalDefinitionStack[] contentOfBaryon = newBaryon.stream()
-                    .map(eQuarkDefinition -> new cElementalDefinitionStack(eQuarkDefinition,1))
-                    .toArray(cElementalDefinitionStack[]::new);
-
-            try {
-                return new cElementalDecay[]{
-                        new cElementalDecay(0.001D, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__),
-                        new cElementalDecay(0.99D, new dHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
-                        eBosonDefinition.deadEnd};
-            } catch (tElementalException e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return new cElementalDecay[]{eBosonDefinition.deadEnd};
-            }
-        }
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return rawLifeTime;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    //@Override
-    //public iElementalDefinition getAnti() {
-    //    cElementalDefinitionStack[] stacks = this.quarkStacks.values();
-    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
-    //    for (int i = 0; i < antiElements.length; i++) {
-    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
-    //    }
-    //    try {
-    //        return new dHadronDefinition(false, antiElements);
-    //    } catch (tElementalException e) {
-    //        if (DEBUG_MODE) e.printStackTrace();
-    //        return null;
-    //    }
-    //}
-
-    @Override
-    public iElementalDefinition getAnti() {
-        cElementalDefinitionStackMap anti = new cElementalDefinitionStackMap();
-        for (cElementalDefinitionStack stack : quarkStacks.valuesToArray()) {
-            anti.putReplace(new cElementalDefinitionStack(stack.definition.getAnti(), stack.amount));
-        }
-        try {
-            return new dHadronDefinition(anti.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    @Override
-    public aFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public aItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public aOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, quarkStacks);
-    }
-
-    public static dHadronDefinition fromNBT(NBTTagCompound nbt) {
-        cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new dHadronDefinition(stacks);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    public static void run() {
-        try {
-            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
-            protonMass = hadron_p.mass;
-            //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
-            hadron_p = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(2), eQuarkDefinition.quark_d.getStackForm(1)));
-            SYMBOL_MAP.put(hadron_p,"p");
-            NAME_MAP.put(hadron_p,"Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
-            hadron_p_ = (dHadronDefinition) hadron_p.getAnti();
-            SYMBOL_MAP.put(hadron_p_,"~p");
-            NAME_MAP.put(hadron_p_,"Anti Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
-            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
-            neutronMass = hadron_n.mass;
-            //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
-            hadron_n = new dHadronDefinition(new cElementalConstantStackMap(eQuarkDefinition.quark_u.getStackForm(1), eQuarkDefinition.quark_d.getStackForm(2)));
-            SYMBOL_MAP.put(hadron_n, "n");
-            NAME_MAP.put(hadron_n, "Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
-            hadron_n_ = (dHadronDefinition) hadron_n.getAnti();
-            SYMBOL_MAP.put(hadron_n_,"~n");
-            NAME_MAP.put(hadron_n_,"Anti Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n_);
-        } catch (tElementalException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            protonMass = -1;
-            neutronMass = -1;
-        }
-        hadron_p1 = new cElementalDefinitionStack(hadron_p, 1D);
-        hadron_n1 = new cElementalDefinitionStack(hadron_n, 1D);
-        hadron_p2 = new cElementalDefinitionStack(hadron_p, 2D);
-        hadron_n2 = new cElementalDefinitionStack(hadron_n, 2D);
-        hadron_p3 = new cElementalDefinitionStack(hadron_p, 3D);
-        hadron_n3 = new cElementalDefinitionStack(hadron_n, 3D);
-        hadron_p5 = new cElementalDefinitionStack(hadron_p, 5D);
-
-        try {
-            cElementalDefinition.addCreatorFromNBT(nbtType, dHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + -64);
-        }
-    }
-
-    public static void setTransformations(){
-        //Added to atom map, but should be in its own
-        cElementalDefinitionStack neutrons=new cElementalDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
-        TRANSFORMATION_INFO.oredictDequantization.put(neutrons.definition,new aOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
-        TRANSFORMATION_INFO.oredictQuantization.put(
-                OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
-                new aOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
-        );
-    }
-
-    @Override
-    public byte getClassType() {
-        return -64;
-    }
-
-    public static byte getClassTypeStatic(){
-        return -64;
-    }
-
-    @Override
-    public int hashCode() {
-        return hash;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getSimpleName());
-            //lines.add("SYMBOL = "+getSymbol());
-        }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java
deleted file mode 100644
index 8b09bfd2e0..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/iaeaNuclide.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.TreeMap;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.util.Util.splitButDifferent;
-
-public final class iaeaNuclide {
-    public static final double AMU_TO_EV_DIV_C_C=9.31494061E08D,MICRO_AMU_TO_EV_DIV_C_C=9.31494061E02D;
-
-    //Nuclide			 T1/2 	 T1/2 [s]	 Decay Modes		  ? 	 Q 	 Q?-	 Q?	 QEC	 Q?- n	 Sn	 Sp	 Binding/A	 Atomic Mass	 Mass Excess	 Discovery
-    //Abund. [mole fract.]		 BR [%]		[?N]	[barn]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[keV]	[? AMU]	[keV]
-
-    //Z,N,symb,radius, unc, energy, unc, jp, half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quad , unc,Qb-,unc,Qb- n,unc,Qa, unc, Qec, unc,Sn,unc, Sp,unc,Binding/A,unc,atomic mass, unc, mass excess,unc,
-    //Z,N,symbol,energy , unc, jp,half-life operator, half_life, unc,unit, half_life [s], unc, decay, decay %, unc, decay, decay %, unc, decay, decay %, unc,isospin,magn. dipole, unc, elect. quadrupole , unc,
-    private static final HashMap<Integer,iaeaNuclide> NUCLIDES=new HashMap<>();
-
-    public static void run(){
-        String line="";
-
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("nuclides.csv")));
-            ArrayList<String[]> blockOfData=new ArrayList<>(4);
-            while((line=reader.readLine())!=null) {
-                String[] split= splitButDifferent(line,",");
-                if(split.length!=19) {
-                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclides database " + line);
-                }
-                if(!split[1].isEmpty() && !blockOfData.isEmpty()) {
-                    new iaeaNuclide(blockOfData.toArray(new String[blockOfData.size()][]));
-                    blockOfData.clear();
-                }
-                blockOfData.add(split);
-            }
-            if(!blockOfData.isEmpty()) {
-                new iaeaNuclide(blockOfData.toArray(new String[blockOfData.size()][]));
-                blockOfData.clear();
-            }
-            reader.close();
-        }catch (Exception e){
-            System.out.println(line);
-            e.printStackTrace();
-        }
-
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("nuclidesTable.csv")));
-            while((line=reader.readLine())!=null) {
-                String[] split= splitButDifferent(line,",");
-                if(split.length!=47) {
-                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA nuclidesTable database " + line);
-                }
-                get(Integer.parseInt(split[0]),Integer.parseInt(split[1])).getMoreData(split);
-            }
-            reader.close();
-        }catch (Exception e){
-            System.out.println(line);
-            e.printStackTrace();
-        }
-
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(iaeaNuclide.class.getResourceAsStream("energyLevels.csv")));
-            while((line=reader.readLine())!=null) {
-                String[] split= splitButDifferent(line,",");
-                if(split.length!=27) {
-                    throw new Error("Invalid count (" + split.length + ") of separators in IAEA energyLevels database " + line);
-                }
-                new energeticState(split);
-            }
-            reader.close();
-        }catch (Exception e){
-            System.out.println(line);
-            e.printStackTrace();
-        }
-
-        for(iaeaNuclide nuclide:NUCLIDES.values()) {
-            nuclide.makeArrayOfEnergyStates();
-        }
-    }
-
-    public static iaeaNuclide get(int protons, int neutrons){
-        return NUCLIDES.get((protons<<16)+neutrons);
-    }
-
-    public final short N,Z;
-    public final double halfTime;//sec
-    public final double mass;//eV/c^2
-    public final short discovery;//year
-    private TreeMap<Double,energeticState> energeticStates;
-    public energeticState[] energeticStatesArray;
-
-
-    private iaeaNuclide(String[][] rows){
-        N=Short.parseShort(rows[1][2]);
-        Z=Short.parseShort(rows[1][0]);
-        NUCLIDES.put(((int)Z <<16)+N,this);
-
-        String[] parts = splitButDifferent(rows[0][16], "|");
-        double Mass=doubleOrNaN(parts[0],"mass");
-        if(!Double.isNaN(Mass)) {
-            //System.out.println("Mass =\t" + Mass+"\t"+(N+Z)+"\t"+N+"\t"+Z+"\t"+(Mass/(N+Z)));
-            mass = Mass* MICRO_AMU_TO_EV_DIV_C_C;
-        }
-        else {
-            mass = Double.NaN;
-        }
-
-        discovery=(short)doubleOrNaN(rows[0][18],"discovery");
-
-        if(rows[0][3].contains("STABLE")){
-            halfTime = STABLE_RAW_LIFE_TIME;
-        }else{
-            parts = splitButDifferent(rows[0][4], "|");
-            halfTime = doubleOrNaN(parts[0],"half life");
-        }
-    }
-
-    private void getMoreData(String[] cells){
-        //if(DEBUG_MODE) {
-        //    if (add(cells[14])) System.out.println(N + " " + Z);
-        //    if (add(cells[17])) System.out.println(N + " " + Z);
-        //    if (add(cells[20])) System.out.println(N + " " + Z);
-        //}
-        new energeticState(this, halfTime, getDecaysFixed(
-                cells[14],
-                doubleOrNaN(cells[15],"chance1"),
-                cells[17],
-                doubleOrNaN(cells[18],"chance1"),
-                cells[20],
-                doubleOrNaN(cells[21],"chance1")));
-    }
-
-    private static final energeticState[] empty=new energeticState[0];
-    private void makeArrayOfEnergyStates(){
-        if(energeticStates==null || energeticStates.isEmpty()) {
-            energeticStatesArray = empty;
-        } else {
-            energeticStatesArray = energeticStates.values().toArray(new energeticState[0]);
-            double life=halfTime;
-            for (energeticState energeticState : energeticStatesArray) {
-                if(Double.isNaN(energeticState.Thalf)){
-                    energeticState.Thalf=life;
-                }else {
-                    life=energeticState.Thalf;
-                }
-            }
-        }
-    }
-
-    private double doubleOrNaN(String s, String name){
-        s=s.replaceAll("#","");
-        if(!s.isEmpty()) {
-            try {
-                double value=Double.parseDouble(s);
-                if(Double.isNaN(value)) {
-                    return Double.NaN;
-                }
-                return value != 0 ?value:Double.NaN;
-            } catch (Exception e) {
-                System.out.println("Invalid Value " + name + ' ' + N + ' ' + Z + ' ' + s);
-                e.printStackTrace();
-            }
-        }
-        return Double.NaN;
-    }
-
-    public static final class energeticState{
-        public final double energy;
-        public double Thalf;
-        public final iaeaDecay[] decaymodes;
-
-        private energeticState(iaeaNuclide nuclide,double Thalf,iaeaDecay[] decaymodes){
-            energy=0;
-            this.Thalf=Thalf;
-            this.decaymodes=decaymodes;
-            if(nuclide.energeticStates==null) {
-                nuclide.energeticStates = new TreeMap<>();
-            }
-            nuclide.energeticStates.put(energy,this);
-        }
-
-        private energeticState(String[] cells){
-            iaeaNuclide nuclide= get((int)doubleOrNaN(cells[0],"protons"),(int)doubleOrNaN(cells[1],"neutrons"));
-            if(nuclide==null) {
-                throw new Error("Missing nuclide " + (int) doubleOrNaN(cells[0], "protons") + ' ' + (int) doubleOrNaN(cells[1], "neutrons"));
-            }
-            energy =doubleOrNaN(cells[3],"energy level",nuclide)*1000D;//to eV
-            if(energy<0) {
-                throw new Error("Invalid energy " + nuclide.N + ' ' + nuclide.Z + ' ' + cells[3]);
-            }
-            Thalf =doubleOrNaN(cells[10],"half life",nuclide);
-            if(nuclide.energeticStates==null) {
-                new Exception("Should be initialized before doing this... "+ nuclide.N + ' ' +nuclide.Z).printStackTrace();
-                nuclide.energeticStates = new TreeMap<>();
-            }
-            nuclide.energeticStates.put(energy,this);
-            //if(DEBUG_MODE) {
-            //    if (add(cells[12])) System.out.println(nuclide.N + " " + nuclide.Z);
-            //    if (add(cells[15])) System.out.println(nuclide.N + " " + nuclide.Z);
-            //    if (add(cells[18])) System.out.println(nuclide.N + " " + nuclide.Z);
-            //}
-            decaymodes = getDecaysFixed(
-                    cells[12],
-                    doubleOrNaN(cells[13],"chance 1",nuclide),
-                    cells[15],
-                    doubleOrNaN(cells[16],"chance 2",nuclide),
-                    cells[18],
-                    doubleOrNaN(cells[19],"chance 3",nuclide));
-        }
-
-        private double doubleOrNaN(String s, String name){
-            return doubleOrNaN(s,name,null);
-        }
-
-        private double doubleOrNaN(String s, String name, iaeaNuclide nuclide){
-            s = s.replaceAll("#", "");
-            if (!s.isEmpty()) {
-                try {
-                    return Double.parseDouble(s);
-                } catch (Exception e) {
-                    if(nuclide==null){
-                        System.out.println("Invalid Value " + name + ' ' + s);
-                    }else {
-                        System.out.println("Invalid Value " + name + ' ' + nuclide.N + ' ' + nuclide.Z + ' ' + s);
-                    }
-                    e.printStackTrace();
-                }
-            }
-            return Double.NaN;
-        }
-    }
-
-    private static HashSet<String> decays=new HashSet<>();
-    private static boolean add(String s){
-        if(decays.add(s)){
-            System.out.println(s);
-            return true;
-        }
-        return false;
-    }
-
-    private static iaeaDecay[] getDecaysFixed(String decay1, double chance1,String decay2, double chance2,String decay3, double chance3){
-        boolean do1,do2,do3;
-        do1= !decay1.isEmpty() && !Double.isNaN(chance1);
-        do2= !decay2.isEmpty() && !Double.isNaN(chance2);
-        do3= !decay3.isEmpty() && !Double.isNaN(chance3);
-        TreeMap<Double,iaeaDecay> decays=new TreeMap<>();
-        if(do1 && do2 && chance1==100 && chance2==100 && chance3!=100){
-            decays.put(1D, new iaeaDecay(1D, decay1));
-            if(do3) {
-                chance3/=100d;
-                decays.put(chance3, new iaeaDecay(chance3, decay2));
-                chance2=1d-chance3;
-            }
-            chance2/=2d;
-            decays.put(chance2, new iaeaDecay(chance2, decay2));
-        }else if(do1 && chance1==100){
-            decays.put(1D, new iaeaDecay(1D, decay1));
-            if(do2) {
-                chance2/=100d;
-                decays.put(chance2, new iaeaDecay(chance2, decay2));
-            }
-            if(do3) {
-                chance3 /= 100d;
-                if(do2) {
-                    chance3 *= chance2;
-                }
-                decays.put(chance3, new iaeaDecay(chance3, decay3));
-            }
-        }else{
-            double normalization= (do1?chance1:0) + (do2?chance2:0) + (do3?chance3:0);
-            if(do1) {
-                chance1/=normalization;
-                decays.put(chance1, new iaeaDecay(chance1, decay1));
-            }
-            if(do2) {
-                chance2/=normalization;
-                decays.put(chance2, new iaeaDecay(chance2, decay2));
-            }
-            if(do3) {
-                chance3/=normalization;
-                decays.put(chance3, new iaeaDecay(chance3, decay3));
-            }
-            if(do1||do2||do3) {
-                decays.put(1D, iaeaDecay.DEAD_END);
-            }
-        }
-        //if(DEBUG_MODE){
-        //    System.out.println("INVALID SUM?\t"+normalization+"\t"+decay1+"\t"+chance1+"\t"+decay2+"\t"+chance2+"\t"+decay3+"\t"+chance3);
-        //}
-        return decays.values().toArray(new iaeaDecay[0]);
-    }
-
-    public static final class iaeaDecay{
-        public final double chance;
-        public final String decayName;
-        public static final iaeaDecay DEAD_END=new iaeaDecay(1D,"DEAD_END");
-        private iaeaDecay(double chance,String decayName){
-            this.chance=chance;
-            this.decayName=decayName;
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
new file mode 100644
index 0000000000..e3efa3b7e6
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -0,0 +1,45 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMBosonDefinition extends EMPrimitive {
+    public static final EMBosonDefinition
+            boson_Y__ = new EMBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
+            boson_H__ = new EMBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
+    //deadEnd
+    public static final EMDecay                   deadEnd     = new EMDecay(boson_Y__, boson_Y__);
+    public static final EMDecay           deadEndHalf = new EMDecay(boson_Y__);
+    public static final EMDefinitionStack boson_Y__1  =new EMDefinitionStack(boson_Y__,1);
+
+    private EMBosonDefinition(String name, String symbol, double mass, int color, int ID) {
+        super(name, symbol, 0, mass, 0, color, ID);
+    }
+
+    public static void run() {
+        boson_Y__.init(null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        boson_H__.init(null, 1.56e-22D, 2, 2,
+                new EMDecay(0.01D, quark_b, quark_b_),
+                new EMDecay(0.02D, lepton_t, lepton_t_),
+                new EMDecay(0.96D, new EMDefinitionStack(boson_Y__, 4)),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Boson: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return this==boson_H__;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
new file mode 100644
index 0000000000..98bdf7ca5c
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -0,0 +1,69 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMLeptonDefinition extends EMPrimitive {
+    public static final EMLeptonDefinition
+            lepton_e = new EMLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
+            lepton_m = new EMLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
+            lepton_t = new EMLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19),
+            lepton_e_ = new EMLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6D, 3, 16),
+            lepton_m_ = new EMLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18),
+            lepton_t_ = new EMLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20);
+
+    public static final EMDefinitionStack lepton_e1  = new EMDefinitionStack(lepton_e, 1);
+    public static final EMDefinitionStack lepton_e2  = new EMDefinitionStack(lepton_e, 2);
+    public static final EMDefinitionStack lepton_e_1 = new EMDefinitionStack(lepton_e_, 1);
+    public static final EMDefinitionStack lepton_e_2 = new EMDefinitionStack(lepton_e_, 2);
+
+    private EMLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
+        super(name, symbol, type, mass, charge, -1, ID);
+        //this.itemThing=null;
+        //this.fluidThing=null;
+    }
+
+    public static void run() {
+        lepton_e.init(lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
+                deadEnd,
+                new EMDecay(lepton_e,boson_Y__));
+        lepton_m.init(lepton_m_, 2.197019e-6D, 0, 1,
+                new EMDecay(0.9D, lepton_e, lepton_Ve_, lepton_Vm),
+                deadEnd);//makes photons and don't care
+        lepton_t.init(lepton_t_, 2.906e-13D, 1, 3,
+                new EMDecay(0.05F, lepton_m, lepton_Vm_, lepton_Vt, boson_H__),
+                new EMDecay(0.1D, lepton_e, lepton_Ve_, lepton_Vm),
+                new EMDecay(0.8D, lepton_m, lepton_Vm_, lepton_Vt, boson_Y__),
+                deadEnd);//makes photons and don't care
+
+        lepton_e_.init(lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
+                deadEnd,
+                new EMDecay(lepton_e,boson_Y__));
+        lepton_m_.init(lepton_m, 2.197019e-6F, 0, 1,
+                new EMDecay(0.9F, lepton_e_, lepton_Ve, lepton_Vm_),
+                deadEnd);//makes photons and don't care
+        lepton_t_.init(lepton_t, 2.906e-13F, 1, 3,
+                new EMDecay(0.05F, lepton_m_, lepton_Vm, lepton_Vt_, boson_H__),
+                new EMDecay(0.1F, lepton_e_, lepton_Ve, lepton_Vm_),
+                new EMDecay(0.8F, lepton_m_, lepton_Vm, lepton_Vt_, boson_Y__),
+                deadEnd);//makes photons and don't care
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Lepton: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
new file mode 100644
index 0000000000..e77c74ed89
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -0,0 +1,59 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMNeutrinoDefinition extends EMPrimitive {
+    public static final EMNeutrinoDefinition
+            lepton_Ve = new EMNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
+            lepton_Vm = new EMNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
+            lepton_Vt = new EMNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6D, 25),
+            lepton_Ve_ = new EMNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0D, 22),
+            lepton_Vm_ = new EMNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24),
+            lepton_Vt_ = new EMNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6D, 26);
+
+    public static final EMDefinitionStack lepton_Ve1  = new EMDefinitionStack(lepton_Ve, 1);
+    public static final EMDefinitionStack lepton_Ve2  = new EMDefinitionStack(lepton_Ve, 2);
+    public static final EMDefinitionStack lepton_Ve_1 = new EMDefinitionStack(lepton_Ve_, 1);
+    public static final EMDefinitionStack lepton_Ve_2 = new EMDefinitionStack(lepton_Ve_, 2);
+
+    private EMNeutrinoDefinition(String name, String symbol, int type, double mass, int ID) {
+        super(name, symbol, type, mass, 0, -1, ID);
+    }
+
+    public static void run() {
+        lepton_Ve.init(lepton_Ve_, 1D, -1, -1,
+                EMDecay.NO_PRODUCT);
+        lepton_Vm.init(lepton_Vm_, 1D, 1, 0,
+                new EMDecay(0.825D, nothing),
+                deadEndHalf);
+        lepton_Vt.init(lepton_Vt_, 1, 1, 0,
+                new EMDecay(0.75F, nothing),
+                deadEnd);
+
+        lepton_Ve_.init(lepton_Ve, 1, -1, -1,
+                EMDecay.NO_PRODUCT);
+        lepton_Vm_.init(lepton_Vm, 1, 1, 0,
+                new EMDecay(0.825F, nothing),
+                deadEndHalf);
+        lepton_Vt_.init(lepton_Vt, 1, 1, 0,
+                new EMDecay(0.75F, nothing),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Lepton: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
new file mode 100644
index 0000000000..68591cc4e6
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -0,0 +1,39 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMPrimitiveDefinition extends EMPrimitive {
+    public static final EMPrimitiveDefinition
+            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, Integer.MIN_VALUE+10_000),
+            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MAX_VALUE-10_000),
+            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, 0),
+            magic = new EMPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
+            magic_ = new EMPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
+
+    private EMPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID) {
+        super(name, symbol, type, mass, 0, color, ID);
+    }
+
+    public static void run() {
+        nbtE__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        null__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        space__.init(space__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        magic.init(magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        magic_.init(magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Primitive: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
new file mode 100644
index 0000000000..b0a5c419e1
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -0,0 +1,106 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public final class EMQuarkDefinition extends EMPrimitive {
+    public static final EMQuarkDefinition
+            quark_u = new EMQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
+            quark_c = new EMQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
+            quark_t = new EMQuarkDefinition("Top", "t", 3, 172.44e9D, 2, 13),
+            quark_d = new EMQuarkDefinition("Down", "d", 1, 4.8e6D, -1, 5),
+            quark_s = new EMQuarkDefinition("Strange", "s", 2, 95e6D, -1, 7),
+            quark_b = new EMQuarkDefinition("Bottom", "b", 3, 4.65e9D, -1, 11),
+            quark_u_ = new EMQuarkDefinition("AntiUp", "~u", -1, 2.3e6D, -2, 4),
+            quark_c_ = new EMQuarkDefinition("AntiCharm", "~c", -2, 1.29e9D, -2, 10),
+            quark_t_ = new EMQuarkDefinition("AntiTop", "~t", -3, 172.44e9D, -2, 14),
+            quark_d_ = new EMQuarkDefinition("AntiDown", "~d", -1, 4.8e6D, 1, 6),
+            quark_s_ = new EMQuarkDefinition("AntiStrange", "~s", -2, 95e6D, 1, 8),
+            quark_b_ = new EMQuarkDefinition("AntiBottom", "~b", -3, 4.65e9D, 1, 12);
+
+    private EMQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
+        super(name, symbol, type, mass, charge, 0, ID);
+    }
+
+    public static void run() {
+        quark_u.init(quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(1.23201e-5D, quark_b/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.050778116D, quark_s/*,lepton_m_,lepton_Vm*/),
+                new EMDecay(0.9D, quark_d, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_c.init(quark_c_, 0.5e-13D, 1, -1,
+                new EMDecay(0.00169744D, quark_b/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.05071504D, quark_d, lepton_m_, lepton_Vm),
+                new EMDecay(0.9D, quark_s, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_t.init(quark_t_, 2.5e-26D, 0, -1,
+                new EMDecay(7.51689e-5D, quark_d, lepton_t_, lepton_Vt),
+                new EMDecay(0.00163216D, quark_s, lepton_m_, lepton_Vm),
+                new EMDecay(0.9D, quark_b, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+
+        quark_d.init(quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(7.51689e-5D, quark_t/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.05071504D, quark_c/*,lepton_m,lepton_Vm_*/),
+                new EMDecay(0.9D, quark_u, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_s.init(quark_s_, 0.6e-9D, 1, -1,
+                new EMDecay(0.00163216D, quark_t/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.050778116D, quark_u, lepton_m, lepton_Vm_),
+                new EMDecay(0.9D, quark_c, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_b.init(quark_b_, 0.7e-13D, 0, -1,
+                new EMDecay(1.23201e-5D, quark_u, lepton_t, lepton_Vt_),
+                new EMDecay(0.00169744D, quark_c, lepton_m, lepton_Vm_),
+                new EMDecay(0.9D, quark_t, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+
+        quark_u_.init(quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(1.23201e-5D, quark_b_/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.050778116D, quark_s_/*,lepton_m,lepton_Vm_*/),
+                new EMDecay(0.9D, quark_d_, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_c_.init(quark_c, 0.5e-13D, 1, -1,
+                new EMDecay(0.00169744F, quark_b_/*,lepton_t,lepton_Vt_*/),
+                new EMDecay(0.05071504F, quark_d_, lepton_m, lepton_Vm_),
+                new EMDecay(0.9F, quark_s_, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_t_.init(quark_t, 2.5e-26F, 0, -1,
+                new EMDecay(7.51689e-5F, quark_d_, lepton_t, lepton_Vt_),
+                new EMDecay(0.00163216F, quark_s_, lepton_m, lepton_Vm_),
+                new EMDecay(0.9F, quark_b_, lepton_e, lepton_Ve_),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+
+        quark_d_.init(quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
+                new EMDecay(7.51689e-5F, quark_t_/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.05071504F, quark_c_/*,lepton_m_,lepton_Vm*/),
+                new EMDecay(0.9F, quark_u_, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_s_.init(quark_s, 0.6e-9F, 1, -1,
+                new EMDecay(0.00163216F, quark_t_/*,lepton_t_,lepton_Vt*/),
+                new EMDecay(0.050778116F, quark_u_, lepton_m_, lepton_Vm),
+                new EMDecay(0.9F, quark_c_, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+        quark_b_.init(quark_b, 0.7e-13F, 0, -1,
+                new EMDecay(1.23201e-5F, quark_u_, lepton_t_, lepton_Vt),
+                new EMDecay(0.00169744F, quark_c_, lepton_m_, lepton_Vm),
+                new EMDecay(0.9F, quark_t_, lepton_e_, lepton_Ve),
+                EMBosonDefinition.deadEnd);//makes photons and don't care
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Quark: " + getName();
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
deleted file mode 100644
index 8096743b78..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/cPrimitiveDefinition.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.noDecay;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class cPrimitiveDefinition extends cElementalPrimitive {
-    public static final cPrimitiveDefinition
-            nbtE__ = new cPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, Integer.MIN_VALUE+10_000),
-            null__ = new cPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MAX_VALUE-10_000),
-            space__ = new cPrimitiveDefinition("Space", "_", 0, 0D, -4, 0),
-            magic = new cPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
-            magic_ = new cPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
-
-    private cPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID) {
-        super(name, symbol, type, mass, 0, color, ID);
-    }
-
-    public static void run() {
-        nbtE__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        null__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        space__.init(space__, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        magic.init(magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        magic_.init(magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-    }
-
-    @Override
-    public String getName() {
-        return "Primitive: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
deleted file mode 100644
index e87df806d3..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eBosonDefinition.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eBosonDefinition extends cElementalPrimitive {
-    public static final eBosonDefinition
-            boson_Y__ = new eBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
-            boson_H__ = new eBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
-    //deadEnd
-    public static final cElementalDecay deadEnd = new cElementalDecay(boson_Y__, boson_Y__);
-    public static final cElementalDecay deadEndHalf = new cElementalDecay(boson_Y__);
-    public static final cElementalDefinitionStack boson_Y__1=new cElementalDefinitionStack(boson_Y__,1);
-
-    private eBosonDefinition(String name, String symbol, double mass, int color, int ID) {
-        super(name, symbol, 0, mass, 0, color, ID);
-    }
-
-    public static void run() {
-        boson_Y__.init(null, NO_DECAY_RAW_LIFE_TIME, -1, -1, noDecay);
-        boson_H__.init(null, 1.56e-22D, 2, 2,
-                new cElementalDecay(0.01D, quark_b, quark_b_),
-                new cElementalDecay(0.02D, lepton_t, lepton_t_),
-                new cElementalDecay(0.96D, new cElementalDefinitionStack(boson_Y__, 4)),
-                deadEnd);
-    }
-
-    @Override
-    public String getName() {
-        return "Boson: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return this==boson_H__;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
deleted file mode 100644
index c8e3b07f02..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eLeptonDefinition.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eNeutrinoDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eLeptonDefinition extends cElementalPrimitive {
-    public static final eLeptonDefinition
-            lepton_e = new eLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
-            lepton_m = new eLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
-            lepton_t = new eLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19),
-            lepton_e_ = new eLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6D, 3, 16),
-            lepton_m_ = new eLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18),
-            lepton_t_ = new eLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20);
-
-    public static final cElementalDefinitionStack lepton_e1 = new cElementalDefinitionStack(lepton_e, 1);
-    public static final cElementalDefinitionStack lepton_e2 = new cElementalDefinitionStack(lepton_e, 2);
-    public static final cElementalDefinitionStack lepton_e_1 = new cElementalDefinitionStack(lepton_e_, 1);
-    public static final cElementalDefinitionStack lepton_e_2 = new cElementalDefinitionStack(lepton_e_, 2);
-
-    private eLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, -1, ID);
-        //this.itemThing=null;
-        //this.fluidThing=null;
-    }
-
-    public static void run() {
-        lepton_e.init(lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
-                deadEnd,
-                new cElementalDecay(lepton_e,boson_Y__));
-        lepton_m.init(lepton_m_, 2.197019e-6D, 0, 1,
-                new cElementalDecay(0.9D, lepton_e, lepton_Ve_, lepton_Vm),
-                deadEnd);//makes photons and don't care
-        lepton_t.init(lepton_t_, 2.906e-13D, 1, 3,
-                new cElementalDecay(0.05F, lepton_m, lepton_Vm_, lepton_Vt, boson_H__),
-                new cElementalDecay(0.1D, lepton_e, lepton_Ve_, lepton_Vm),
-                new cElementalDecay(0.8D, lepton_m, lepton_Vm_, lepton_Vt, boson_Y__),
-                deadEnd);//makes photons and don't care
-
-        lepton_e_.init(lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
-                deadEnd,
-                new cElementalDecay(lepton_e,boson_Y__));
-        lepton_m_.init(lepton_m, 2.197019e-6F, 0, 1,
-                new cElementalDecay(0.9F, lepton_e_, lepton_Ve, lepton_Vm_),
-                deadEnd);//makes photons and don't care
-        lepton_t_.init(lepton_t, 2.906e-13F, 1, 3,
-                new cElementalDecay(0.05F, lepton_m_, lepton_Vm, lepton_Vt_, boson_H__),
-                new cElementalDecay(0.1F, lepton_e_, lepton_Ve, lepton_Vm_),
-                new cElementalDecay(0.8F, lepton_m_, lepton_Vm, lepton_Vt_, boson_Y__),
-                deadEnd);//makes photons and don't care
-    }
-
-    @Override
-    public String getName() {
-        return "Lepton: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
deleted file mode 100644
index 0f0725d208..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eNeutrinoDefinition.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eBosonDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eNeutrinoDefinition extends cElementalPrimitive {
-    public static final eNeutrinoDefinition
-            lepton_Ve = new eNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
-            lepton_Vm = new eNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
-            lepton_Vt = new eNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6D, 25),
-            lepton_Ve_ = new eNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0D, 22),
-            lepton_Vm_ = new eNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24),
-            lepton_Vt_ = new eNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6D, 26);
-
-    public static final cElementalDefinitionStack lepton_Ve1 = new cElementalDefinitionStack(lepton_Ve, 1);
-    public static final cElementalDefinitionStack lepton_Ve2 = new cElementalDefinitionStack(lepton_Ve, 2);
-    public static final cElementalDefinitionStack lepton_Ve_1 = new cElementalDefinitionStack(lepton_Ve_, 1);
-    public static final cElementalDefinitionStack lepton_Ve_2 = new cElementalDefinitionStack(lepton_Ve_, 2);
-
-    private eNeutrinoDefinition(String name, String symbol, int type, double mass, int ID) {
-        super(name, symbol, type, mass, 0, -1, ID);
-    }
-
-    public static void run() {
-        lepton_Ve.init(lepton_Ve_, 1D, -1, -1,
-                cElementalDecay.noProduct);
-        lepton_Vm.init(lepton_Vm_, 1D, 1, 0,
-                new cElementalDecay(0.825D, nothing),
-                deadEndHalf);
-        lepton_Vt.init(lepton_Vt_, 1, 1, 0,
-                new cElementalDecay(0.75F, nothing),
-                deadEnd);
-
-        lepton_Ve_.init(lepton_Ve, 1, -1, -1,
-                cElementalDecay.noProduct);
-        lepton_Vm_.init(lepton_Vm, 1, 1, 0,
-                new cElementalDecay(0.825F, nothing),
-                deadEndHalf);
-        lepton_Vt_.init(lepton_Vt, 1, 1, 0,
-                new cElementalDecay(0.75F, nothing),
-                deadEnd);
-    }
-
-    @Override
-    public String getName() {
-        return "Lepton: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
deleted file mode 100644
index 798066466b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/eQuarkDefinition.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eLeptonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eNeutrinoDefinition.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class eQuarkDefinition extends cElementalPrimitive {
-    public static final eQuarkDefinition
-            quark_u = new eQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
-            quark_c = new eQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
-            quark_t = new eQuarkDefinition("Top", "t", 3, 172.44e9D, 2, 13),
-            quark_d = new eQuarkDefinition("Down", "d", 1, 4.8e6D, -1, 5),
-            quark_s = new eQuarkDefinition("Strange", "s", 2, 95e6D, -1, 7),
-            quark_b = new eQuarkDefinition("Bottom", "b", 3, 4.65e9D, -1, 11),
-            quark_u_ = new eQuarkDefinition("AntiUp", "~u", -1, 2.3e6D, -2, 4),
-            quark_c_ = new eQuarkDefinition("AntiCharm", "~c", -2, 1.29e9D, -2, 10),
-            quark_t_ = new eQuarkDefinition("AntiTop", "~t", -3, 172.44e9D, -2, 14),
-            quark_d_ = new eQuarkDefinition("AntiDown", "~d", -1, 4.8e6D, 1, 6),
-            quark_s_ = new eQuarkDefinition("AntiStrange", "~s", -2, 95e6D, 1, 8),
-            quark_b_ = new eQuarkDefinition("AntiBottom", "~b", -3, 4.65e9D, 1, 12);
-
-    private eQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, 0, ID);
-    }
-
-    public static void run() {
-        quark_u.init(quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(1.23201e-5D, quark_b/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.050778116D, quark_s/*,lepton_m_,lepton_Vm*/),
-                new cElementalDecay(0.9D, quark_d, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c.init(quark_c_, 0.5e-13D, 1, -1,
-                new cElementalDecay(0.00169744D, quark_b/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.05071504D, quark_d, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9D, quark_s, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t.init(quark_t_, 2.5e-26D, 0, -1,
-                new cElementalDecay(7.51689e-5D, quark_d, lepton_t_, lepton_Vt),
-                new cElementalDecay(0.00163216D, quark_s, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9D, quark_b, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-
-        quark_d.init(quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(7.51689e-5D, quark_t/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.05071504D, quark_c/*,lepton_m,lepton_Vm_*/),
-                new cElementalDecay(0.9D, quark_u, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s.init(quark_s_, 0.6e-9D, 1, -1,
-                new cElementalDecay(0.00163216D, quark_t/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.050778116D, quark_u, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9D, quark_c, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b.init(quark_b_, 0.7e-13D, 0, -1,
-                new cElementalDecay(1.23201e-5D, quark_u, lepton_t, lepton_Vt_),
-                new cElementalDecay(0.00169744D, quark_c, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9D, quark_t, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-
-        quark_u_.init(quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(1.23201e-5D, quark_b_/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.050778116D, quark_s_/*,lepton_m,lepton_Vm_*/),
-                new cElementalDecay(0.9D, quark_d_, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c_.init(quark_c, 0.5e-13D, 1, -1,
-                new cElementalDecay(0.00169744F, quark_b_/*,lepton_t,lepton_Vt_*/),
-                new cElementalDecay(0.05071504F, quark_d_, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9F, quark_s_, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t_.init(quark_t, 2.5e-26F, 0, -1,
-                new cElementalDecay(7.51689e-5F, quark_d_, lepton_t, lepton_Vt_),
-                new cElementalDecay(0.00163216F, quark_s_, lepton_m, lepton_Vm_),
-                new cElementalDecay(0.9F, quark_b_, lepton_e, lepton_Ve_),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-
-        quark_d_.init(quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
-                new cElementalDecay(7.51689e-5F, quark_t_/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.05071504F, quark_c_/*,lepton_m_,lepton_Vm*/),
-                new cElementalDecay(0.9F, quark_u_, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s_.init(quark_s, 0.6e-9F, 1, -1,
-                new cElementalDecay(0.00163216F, quark_t_/*,lepton_t_,lepton_Vt*/),
-                new cElementalDecay(0.050778116F, quark_u_, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9F, quark_c_, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b_.init(quark_b, 0.7e-13F, 0, -1,
-                new cElementalDecay(1.23201e-5F, quark_u_, lepton_t_, lepton_Vt),
-                new cElementalDecay(0.00169744F, quark_c_, lepton_m_, lepton_Vm),
-                new cElementalDecay(0.9F, quark_t_, lepton_e_, lepton_Ve),
-                eBosonDefinition.deadEnd);//makes photons and don't care
-    }
-
-    @Override
-    public String getName() {
-        return "Quark: " + name;
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index 05f251924e..f5cfad22f3 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,9 +1,11 @@
 package com.github.technus.tectech.recipe;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.item.ItemStack;
@@ -17,16 +19,16 @@ import java.util.HashSet;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 
 public class TT_recipe extends GT_Recipe {
-    public static final String                E_RECIPE_ID = "eRecipeID";
-    public final cElementalConstantStackMap[] input;
-    public final cElementalConstantStackMap[] output;
-    public final cElementalConstantStackMap[] eCatalyst;
-    public final IAdditionalCheck             additionalCheck;
+    public static final String        E_RECIPE_ID = "eRecipeID";
+    public final EMConstantStackMap[]             input;
+    public final IEMMapRead<? extends IEMStack>[] output;
+    public final EMConstantStackMap[]             eCatalyst;
+    public final IAdditionalCheck     additionalCheck;
 
     public TT_recipe(boolean aOptimize,
                      ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances,
                      FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue,
-                     cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check){
+                     EMConstantStackMap[] in, IEMMapRead<? extends IEMStack>[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check){
         super(aOptimize,aInputs,aOutputs,aSpecialItems,aChances,aFluidInputs,aFluidOutputs,aDuration,aEUt,aSpecialValue);
         input=in;
         output=out;
@@ -38,11 +40,11 @@ public class TT_recipe extends GT_Recipe {
         return EMisRecipeInputEqual(consume,doNotCheckStackSizes,itemStacks,fluidStacks,null,null);
     }
 
-    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap[] in){
+    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap[] in){
         return EMisRecipeInputEqual(consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,null);
     }
     
-    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap[] in, cElementalInstanceStackMap[] catalyst) {
+    public boolean EMisRecipeInputEqual(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap[] in, EMInstanceStackMap[] catalyst) {
         if(additionalCheck !=null && !additionalCheck.check(this,consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,catalyst)) {
             return false;
         }
@@ -51,7 +53,7 @@ public class TT_recipe extends GT_Recipe {
                 for (int i = 0; i < eCatalyst.length; i++) {
                     if (eCatalyst[i] != null && eCatalyst[i].hasStacks()) {
                         if (catalyst[i] != null && catalyst[i].hasStacks()) {
-                            if (!catalyst[i].removeAllAmounts(true, eCatalyst[i])) {
+                            if (!catalyst[i].containsAllAmounts(eCatalyst[i])) {
                                 return false;
                             }
                         } else {
@@ -68,8 +70,14 @@ public class TT_recipe extends GT_Recipe {
                 for (int i = 0; i < input.length; i++) {
                     if (input[i] != null && input[i].hasStacks()) {
                         if (in[i] != null && in[i].hasStacks()) {
-                            if (!in[i].removeAllAmounts(consume, input[i])) {
-                                return false;
+                            if(consume){
+                                if (!in[i].removeAllAmounts(input[i])) {
+                                    return false;
+                                }
+                            }else {
+                                if (!in[i].containsAllAmounts(input[i])) {
+                                    return false;
+                                }
                             }
                         } else {
                             return false;
@@ -83,11 +91,13 @@ public class TT_recipe extends GT_Recipe {
         return super.isRecipeInputEqual(consume, doNotCheckStackSizes, fluidStacks, itemStacks);
     }
 
-    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap in){
+    @Deprecated
+    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in){
         return EMisRecipeInputEqualConsumeFromOne(consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,null);
     }
 
-    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap in, cElementalInstanceStackMap[] catalyst) {
+    @Deprecated
+    public boolean EMisRecipeInputEqualConsumeFromOne(boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in, EMInstanceStackMap[] catalyst) {
         if(additionalCheck !=null && !additionalCheck.check(this,consume,doNotCheckStackSizes,itemStacks,fluidStacks,in,catalyst)) {
             return false;
         }
@@ -96,7 +106,7 @@ public class TT_recipe extends GT_Recipe {
                 for (int i = 0; i < eCatalyst.length; i++) {
                     if (eCatalyst[i] != null && eCatalyst[i].hasStacks()) {
                         if (catalyst[i] != null && catalyst[i].hasStacks()) {
-                            if (!catalyst[i].removeAllAmounts(true, eCatalyst[i])) {
+                            if (!catalyst[i].containsAllAmounts(eCatalyst[i])) {
                                 return false;
                             }
                         } else {
@@ -110,11 +120,17 @@ public class TT_recipe extends GT_Recipe {
         }
         if (input != null) {
             if (in != null) {
-                for (cElementalConstantStackMap anInput : input) {
+                for (EMConstantStackMap anInput : input) {
                     if (anInput != null && anInput.hasStacks()) {
                         if (in.hasStacks()) {
-                            if (!in.removeAllAmounts(consume, anInput)) {
-                                return false;
+                            if(consume){
+                                if (!in.removeAllAmounts(anInput)) {
+                                    return false;
+                                }
+                            }else {
+                                if (!in.containsAllAmounts(anInput)) {
+                                    return false;
+                                }
                             }
                         } else {
                             return false;
@@ -129,8 +145,8 @@ public class TT_recipe extends GT_Recipe {
     }
     
     public interface IAdditionalCheck {
-        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap[] in, cElementalInstanceStackMap[] e);
-        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, cElementalInstanceStackMap in, cElementalInstanceStackMap[] e);
+        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap[] in, EMInstanceStackMap[] e);
+        boolean check(TT_recipe thisRecipe, boolean consume, boolean doNotCheckStackSizes, ItemStack[] itemStacks, FluidStack[] fluidStacks, EMInstanceStackMap in, EMInstanceStackMap[] e);
     }
 
     public static class TT_Recipe_Map<T extends TT_recipe> {
@@ -166,12 +182,20 @@ public class TT_recipe extends GT_Recipe {
     }
 
     public static class GT_Recipe_MapTT extends GT_Recipe.GT_Recipe_Map {
-        public static GT_Recipe_MapTT sResearchableFakeRecipes =new GT_Recipe_MapTT(new HashSet<>(32), "gt.recipe.researchStation", "Research station", null, "gregtech:textures/gui/multimachines/ResearchFake", 1, 1,1,0,1,"", 1, "", true, false);//nei to false - using custom handler
-        public static GT_Recipe_MapTT sScannableFakeRecipes = new GT_Recipe_MapTT(new HashSet<>(32),"gt.recipe.em_scanner","EM Scanner Research", null,"gregtech:textures/gui/multimachines/ResearchFake",1,1,1,0,1,"",1,"",true,false);
-        public static ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes=new ArrayList<>();
+        public static GT_Recipe_MapTT                   sResearchableFakeRecipes = new GT_Recipe_MapTT(new HashSet<>(32), "gt.recipe.researchStation", "Research station", null, "gregtech:textures/gui/multimachines/ResearchFake", 1, 1, 1, 0, 1, "", 1, "", true, false);//nei to false - using custom handler
+        public static GT_Recipe_MapTT                   sScannableFakeRecipes    = new GT_Recipe_MapTT(new HashSet<>(32), "gt.recipe.em_scanner", "EM Scanner Research", null, "gregtech:textures/gui/multimachines/ResearchFake", 1, 1, 1, 0, 1, "", 1, "", true, false);
+        public static ArrayList<GT_Recipe_AssemblyLine> sAssemblylineRecipes     = new ArrayList<>();
 
-        public GT_Recipe_MapTT(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
-            super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath, aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids, aAmperage, aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost, aShowVoltageAmperageInNEI, aNEIAllowed);
+        public GT_Recipe_MapTT(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName, String aNEIGUIPath,
+                               int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems, int aMinimalInputFluids,
+                               int aAmperage,
+                               String aNEISpecialValuePre, int aNEISpecialValueMultiplier, String aNEISpecialValuePost,
+                               boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
+            super(aRecipeList, aUnlocalizedName, aLocalName, aNEIName, aNEIGUIPath,
+                    aUsualInputCount, aUsualOutputCount, aMinimalInputItems, aMinimalInputFluids,
+                    aAmperage,
+                    aNEISpecialValuePre, aNEISpecialValueMultiplier, aNEISpecialValuePost,
+                    aShowVoltageAmperageInNEI, aNEIAllowed);
         }
     }
 
@@ -181,7 +205,7 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
+                                EMConstantStackMap[] in, EMConstantStackMap[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchItem=researchItem;
         }
@@ -189,28 +213,28 @@ public class TT_recipe extends GT_Recipe {
         public TT_assLineRecipe(boolean aOptimize, ItemStack researchItem,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalConstantStackMap[] in) {
+                                EMConstantStackMap[] in) {
             this(aOptimize, researchItem, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
 
     public static class TT_EMRecipe extends TT_recipe{
-        public final iElementalDefinition mResearchEM;
-        public final GT_Recipe scannerRecipe;
+        public final IEMDefinition mResearchEM;
+        public final GT_Recipe     scannerRecipe;
 
-        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
+        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, IEMDefinition researchEM,
                            ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                            FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                           cElementalConstantStackMap[] in, cElementalConstantStackMap[] out, cElementalConstantStackMap[] catalyst, IAdditionalCheck check) {
+                           EMConstantStackMap[] in, EMConstantStackMap[] out, EMConstantStackMap[] catalyst, IAdditionalCheck check) {
             super(aOptimize, aInputs, aOutputs, aSpecialItems, null, aFluidInputs, null, aDuration, aEUt, aSpecialValue, in, out, catalyst, check);
             mResearchEM=researchEM;
             this.scannerRecipe=scannerRecipe;
         }
 
-        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, iElementalDefinition researchEM,
+        public TT_EMRecipe(boolean aOptimize, GT_Recipe scannerRecipe, IEMDefinition researchEM,
                                 ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems,
                                 FluidStack[] aFluidInputs, int aDuration, int aEUt, int aSpecialValue,
-                                cElementalConstantStackMap[] in) {
+                                EMConstantStackMap[] in) {
             this(aOptimize, scannerRecipe, researchEM, aInputs, aOutputs, aSpecialItems, aFluidInputs, aDuration, aEUt, aSpecialValue, in, null, null,null);
         }
     }
@@ -219,8 +243,8 @@ public class TT_recipe extends GT_Recipe {
         public static TT_Recipe_Map_EM<TT_EMRecipe> sCrafterRecipesEM = new TT_Recipe_Map_EM<>("EM Crafter Recipes","gt.recipe.em_crafter",null);
         public static TT_Recipe_Map_EM<TT_EMRecipe> sMachineRecipesEM = new TT_Recipe_Map_EM<>("EM Machinert Recipe","gt.recipe.em_machinery",null);
 
-        private final HashMap<iElementalDefinition,T> mRecipeMap;
-        public final String mNEIName,mUnlocalizedName,mNEIGUIPath;
+        private final HashMap<IEMDefinition,T> mRecipeMap;
+        public final String                    mNEIName,mUnlocalizedName,mNEIGUIPath;
 
         public TT_Recipe_Map_EM(String mNEIName,String mUnlocalizedName,String mNEIGUIPath){
             mRecipeMap =new HashMap<>(16);
@@ -229,7 +253,7 @@ public class TT_recipe extends GT_Recipe {
             this.mNEIGUIPath=mNEIGUIPath;
         }
 
-        public T findRecipe(iElementalDefinition stack){
+        public T findRecipe(IEMDefinition stack){
             return mRecipeMap.get(stack);
         }
 
@@ -238,7 +262,7 @@ public class TT_recipe extends GT_Recipe {
                 return null;
             }
             try {
-                return mRecipeMap.get(cElementalDefinition.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
+                return mRecipeMap.get(EMComplex.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
             }catch (Exception e){
                 if (DEBUG_MODE) {
                     e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index ffa69ef78e..c72bf0ab9e 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.recipe;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting;
@@ -150,7 +150,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMmachineRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, EMConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -184,7 +184,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
     public static boolean addResearchableEMcrafterRecipe(
             ItemStack aResearchItem, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            EMConstantStackMap[] eInputs, EMConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchItem==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -206,8 +206,8 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
     }
 
     public static boolean addScannableEMmachineRecipe(
-            iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            ItemStack[] aInputs, FluidStack[] aFluidInputs, cElementalConstantStackMap[] eInputs,
+            IEMDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
+            ItemStack[] aInputs, FluidStack[] aFluidInputs, EMConstantStackMap[] eInputs,
             ItemStack aOutput, int machineDuration, int machineEUt, int machineAmperage) {
         if(aInputs==null) {
             aInputs = nullItem;
@@ -234,7 +234,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new EMConstantStackMap(new EMDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_machine.machine)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,aInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 aFluidInputs,machineDuration,machineEUt,machineAmperage,eInputs));
@@ -242,8 +242,8 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
     }
 
     public static boolean addScannableEMcrafterRecipe(
-            iElementalDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
-            cElementalConstantStackMap[] eInputs, cElementalConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
+            IEMDefinition aResearchEM, int totalComputationRequired, int computationRequiredPerSec, int researchEUt, int researchAmperage,
+            EMConstantStackMap[] eInputs, EMConstantStackMap[] catalyst, TT_recipe.IAdditionalCheck check,
             ItemStack aOutput, int crafterDuration, int crafterEUt, int crafterAmperage) {
         if (aResearchEM==null || totalComputationRequired<=0 || aOutput == null) {
             return false;
@@ -259,7 +259,7 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             computationRequiredPerSec = Short.MAX_VALUE;
         }
         ItemStack placeholder=new ItemStack(ElementalDefinitionContainer_EM.INSTANCE);
-        ElementalDefinitionContainer_EM.setContent(placeholder,new cElementalConstantStackMap(new cElementalDefinitionStack(aResearchEM,1)));
+        ElementalDefinitionContainer_EM.setContent(placeholder,new EMConstantStackMap(new EMDefinitionStack(aResearchEM,1)));
         GT_Recipe thisRecipe=TT_recipe.GT_Recipe_MapTT.sScannableFakeRecipes.addFakeRecipe(false, new ItemStack[]{placeholder}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Writes Research result for "+ GT_MetaTileEntity_EM_crafting.crafter)}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.add(new TT_recipe.TT_EMRecipe(false,thisRecipe,aResearchEM,null,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataOrb.getWithName(1L, "Reads Research result")},
                 null,crafterDuration,crafterEUt,crafterAmperage,eInputs,null,catalyst,check));
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index b1f6d8887b..107cb97103 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -3,11 +3,11 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -31,7 +31,7 @@ import java.util.TreeSet;
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -39,7 +39,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  * Created by Tec on 15.03.2017.
  */
 public final class DebugElementalInstanceContainer_EM extends Item implements IElementalItem {
-    public static final TreeSet<iElementalDefinition> STACKS_REGISTERED =new TreeSet<>();
+    public static final TreeSet<IEMDefinition> STACKS_REGISTERED =new TreeSet<>();
 
     public static DebugElementalInstanceContainer_EM INSTANCE;
 
@@ -58,23 +58,23 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
             aStack.stackSize = 1;
             if (tTileEntity instanceof IGregTechTileEntity) {
                 IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-                if (metaTE instanceof iElementalContainer) {
-                    cElementalInstanceStackMap content = ((iElementalContainer) metaTE).getContentHandler();
+                if (metaTE instanceof IEMContainer) {
+                    EMInstanceStackMap content = ((IEMContainer) metaTE).getContentHandler();
                     if (tNBT.hasKey("content")) {
                         try {
-                            content.putUnifyAll(cElementalInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
-                        } catch (tElementalException e) {
+                            content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+                        } catch (EMException e) {
                             if (DEBUG_MODE) {
                                 e.printStackTrace();
                             }
                             return true;
                         }
-                        ((iElementalContainer) metaTE).purgeOverflow();
+                        ((IEMContainer) metaTE).purgeOverflow();
                         tNBT.removeTag("content");
                         tNBT.removeTag("symbols");
                         tNBT.removeTag("info");
                     } else if (content.hasStacks()) {
-                        ((iElementalContainer) metaTE).purgeOverflow();
+                        ((IEMContainer) metaTE).purgeOverflow();
                         tNBT.setTag("info", content.getInfoNBT());
                         tNBT.setTag("content", content.toNBT());
                         tNBT.setTag("symbols", content.getShortSymbolsNBT());
@@ -87,7 +87,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         return aPlayer instanceof EntityPlayerMP;
     }
 
-    public ItemStack setContent(ItemStack aStack,cElementalInstanceStackMap content){
+    public ItemStack setContent(ItemStack aStack, EMInstanceStackMap content){
         NBTTagCompound tNBT = aStack.getTagCompound();
         if(tNBT==null){
             tNBT=new NBTTagCompound();
@@ -95,8 +95,8 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         }
         if (tNBT.hasKey("content")) {
             try {
-                content.putUnifyAll(cElementalInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
-            } catch (tElementalException e) {
+                content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+            } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
@@ -141,10 +141,10 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         ItemStack that = new ItemStack(this, 1);
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
-        for(iElementalDefinition definition: STACKS_REGISTERED){
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 144 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_144))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getName()+" 1000 mol"),new cElementalInstanceStackMap(new cElementalInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
+        for(IEMDefinition definition: STACKS_REGISTERED){
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 144 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_144))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1000 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index 2513bdf8bf..2cca6474f4 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -3,8 +3,8 @@ package com.github.technus.tectech.thing.item;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -38,18 +38,18 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
     }
 
     //return previous thing
-    public static cElementalConstantStackMap setContent(ItemStack containerItem, cElementalConstantStackMap definitions){
+    public static EMConstantStackMap setContent(ItemStack containerItem, EMConstantStackMap definitions){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM) {
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 tNBT = containerItem.stackTagCompound = new NBTTagCompound();
             }
 
-            cElementalConstantStackMap oldMap =null;
+            EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
-                } catch (tElementalException e) {
+                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
                     }
@@ -63,7 +63,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalConstantStackMap getContent(ItemStack containerItem){
+    public static EMConstantStackMap getContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
 
@@ -71,8 +71,8 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 return null;
             }
             try {
-                return cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
-            } catch (tElementalException e) {
+                return EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+            } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
@@ -81,18 +81,18 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         return null;
     }
 
-    public static cElementalConstantStackMap clearContent(ItemStack containerItem){
+    public static EMConstantStackMap clearContent(ItemStack containerItem){
         if(containerItem.getItem() instanceof ElementalDefinitionContainer_EM){
             NBTTagCompound tNBT = containerItem.stackTagCompound;
             if (tNBT == null) {
                 return null;
             }
 
-            cElementalConstantStackMap oldMap =null;
+            EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= cElementalConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
-                } catch (tElementalException e) {
+                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
                     }
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index e43feb2351..e517fe5f2a 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -44,7 +44,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item implements IEl
     }
 
     //return previous thing
-    public static void setContent(ItemStack containerItem, cElementalInstanceStackMap definitions, int[] detailsOnDepthLevels){
+    public static void setContent(ItemStack containerItem, EMInstanceStackMap definitions, int[] detailsOnDepthLevels){
         if(containerItem.getItem() instanceof ElementalDefinitionScanStorage_EM) {
             if (containerItem.stackTagCompound == null) {
                 containerItem.stackTagCompound = new NBTTagCompound();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index d25a0c62ed..0950a173ab 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalContainer;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToElementalPipe;
 import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.relauncher.Side;
@@ -24,7 +24,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 import static com.github.technus.tectech.util.CommonValues.*;
 import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
@@ -34,16 +34,16 @@ import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 /**
  * Created by danie_000 on 11.12.2016.
  */
-public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements iElementalContainer, IConnectsToElementalPipe {
+public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_MetaTileEntity_Hatch implements IEMContainer, IConnectsToElementalPipe {
     private static Textures.BlockIcons.CustomIcon EM_T_SIDES;
     private static Textures.BlockIcons.CustomIcon EM_T_ACTIVE;
     private static Textures.BlockIcons.CustomIcon EM_T_CONN;
 
     private String clientLocale = "en_US";
 
-    protected cElementalInstanceStackMap content = new cElementalInstanceStackMap();
+    protected EMInstanceStackMap content      = new EMInstanceStackMap();
     //float lifeTimeMult=1f;
-    public int postEnergize = 0;
+    public    int                postEnergize = 0;
     public double overflowMatter = 0f;
     public short id = -1;
     private byte deathDelay = 2;
@@ -95,13 +95,13 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         overflowMatter = aNBT.getFloat("overflowMatter")+aNBT.getDouble("OverflowMatter");
         id = aNBT.getShort("eID");
         try {
-            content = cElementalInstanceStackMap.fromNBT(aNBT.getCompoundTag("eM_Stacks"));
-        } catch (tElementalException e) {
+            content = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eM_Stacks"));
+        } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
             if (content == null) {
-                content = new cElementalInstanceStackMap();
+                content = new EMInstanceStackMap();
             }
         }
     }
@@ -165,7 +165,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     @Override
-    public cElementalInstanceStackMap getContentHandler() {
+    public EMInstanceStackMap getContentHandler() {
         return content;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index a61bf27fe3..4a0bb55784 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -1,17 +1,17 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.dComplexAspectDefinition;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.ePrimalAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.cElementalDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.cElementalPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.eQuarkDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
 import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
 import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -38,7 +38,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import java.util.HashMap;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
@@ -61,9 +61,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     private static double MASS_TO_EU_INSTANT;
     private static int STARTUP_COST, KEEPUP_COST;
 
-    protected byte eTier = 0;
-    protected cElementalInstanceStack stack;
-    private long plasmaEnergy;
+    protected byte            eTier = 0;
+    protected EMInstanceStack stack;
+    private   long            plasmaEnergy;
 
     protected boolean started = false;
     //endregion
@@ -73,7 +73,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
 
     public interface IPrimitiveColliderHandler {
-        void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out);
+        void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out);
     }
 
     public interface IColliderHandler extends IPrimitiveColliderHandler {
@@ -81,23 +81,23 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     static {
-        FUSE_HANDLERS.put((dAtomDefinition.getClassTypeStatic() << 16) | dAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | EMAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnifyAll(in2.definition.getSubParticles());
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -106,27 +106,27 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 return 1;
             }
         });
-        registerSimpleAtomFuse(dHadronDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(dComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(cElementalPrimitive.getClassTypeStatic());
+        registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMPrimitive.getClassTypeStatic());
 
-        FUSE_HANDLERS.put((dHadronDefinition.getClassTypeStatic() << 16) | dHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnifyAll(in2.definition.getSubParticles());
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -135,23 +135,23 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 return 2;
             }
         });
-        FUSE_HANDLERS.put((dHadronDefinition.getClassTypeStatic() << 16) | cElementalPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnify(in2.definition.getStackForm(1));
-                    dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -161,13 +161,13 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             }
         });
 
-        registerSimpleAspectFuse(dComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAspectFuse(cElementalPrimitive.getClassTypeStatic());
+        registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAspectFuse(EMPrimitive.getClassTypeStatic());
 
-        FUSE_HANDLERS.put((cElementalPrimitive.getClassTypeStatic() << 16) | cElementalPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMPrimitive.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
-                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.definition.getClass().getName() + '\0' + in2.definition.getClass().getName());
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
                 if (collisionHandler != null) {
                     collisionHandler.collide(in2, in1, out);
                 } else {
@@ -181,40 +181,40 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             }
         });
 
-        PRIMITIVE_FUSE_HANDLERS.put(eQuarkDefinition.class.getName() + '\0' + eQuarkDefinition.class.getName(), (in1, in2, out) -> {
+        PRIMITIVE_FUSE_HANDLERS.put(EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> {
             try {
-                cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                defs.putUnify(in1.definition.getStackForm(1));
-                defs.putUnify(in2.definition.getStackForm(1));
-                dHadronDefinition hadron = new dHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                out.putUnify(new cElementalInstanceStack(hadron, Math.min(in1.amount, in2.amount)));
+                EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+                defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
             } catch (Exception e) {
                 out.putUnifyAll(in1, in2);
                 return;
             }
-            if (in1.amount > in2.amount) {
-                out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-            } else if (in2.amount > in1.amount) {
-                out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
             }
         });
-        PRIMITIVE_FUSE_HANDLERS.put(ePrimalAspectDefinition.class.getName() + '\0' + ePrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
+        PRIMITIVE_FUSE_HANDLERS.put(EMPrimalAspectDefinition.class.getName() + '\0' + EMPrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
             if (fuseAspects(in1, in2, out)) return;
-            if (in1.amount > in2.amount) {
-                out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-            } else if (in2.amount > in1.amount) {
-                out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
             }
         });
     }
 
-    private static boolean fuseAspects(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+    private static boolean fuseAspects(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
         try {
-            cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-            defs.putUnify(in1.definition.getStackForm(1));
-            defs.putUnify(in2.definition.getStackForm(1));
-            dComplexAspectDefinition aspect = new dComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-            out.putUnify(new cElementalInstanceStack(aspect, Math.min(in1.amount, in2.amount)));
+            EMDefinitionStackMap defs = new EMDefinitionStackMap();
+            defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+            defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+            EMComplexAspectDefinition aspect = new EMComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+            out.putUnify(new EMInstanceStack(aspect, Math.min(in1.getAmount(), in2.getAmount())));
         } catch (Exception e) {
             out.putUnifyAll(in1, in2);
             return true;
@@ -223,14 +223,14 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     private static void registerSimpleAspectFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((dComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+        FUSE_HANDLERS.put((EMComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 if (fuseAspects(in1, in2, out)) return;
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -242,23 +242,23 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     private static void registerSimpleAtomFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((dAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
             @Override
-            public void collide(cElementalInstanceStack in1, cElementalInstanceStack in2, cElementalInstanceStackMap out) {
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
-                    cElementalDefinitionStackMap defs = new cElementalDefinitionStackMap();
-                    defs.putUnifyAll(in1.definition.getSubParticles());
-                    defs.putUnify(in2.definition.getStackForm(1));
-                    dAtomDefinition atom = new dAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new cElementalInstanceStack(atom, Math.min(in1.amount, in2.amount)));
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
                 } catch (Exception e) {
                     out.putUnifyAll(in1, in2);
                     return;
                 }
-                if (in1.amount > in2.amount) {
-                    out.putUnify(new cElementalInstanceStack(in1.definition, in1.amount - in2.amount));
-                } else if (in2.amount > in1.amount) {
-                    out.putUnify(new cElementalInstanceStack(in2.definition, in2.amount - in1.amount));
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
                 }
             }
 
@@ -378,27 +378,27 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     protected double fuse(GT_MetaTileEntity_EM_collider partner) {///CAN MAKE EU
         if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            boolean check = stack.definition.fusionMakesEnergy(stack.getEnergy()) &&
-                    partner.stack.definition.fusionMakesEnergy(partner.stack.getEnergy());
+            boolean check = stack.getDefinition().fusionMakesEnergy(stack.getEnergy()) &&
+                    partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
 
-            cElementalInstanceStack stack2 = partner.stack;
-            double preMass = add(stack2.getMass(),stack.getMass());
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = add(stack2.getMass(),stack.getMass());
             //System.out.println("preMass = " + preMass);
 
-            cElementalInstanceStackMap map = new cElementalInstanceStackMap();
-            IColliderHandler colliderHandler;
-            if (stack2.definition.getClassType() > stack.definition.getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.definition.getClassType() << 16) | stack.definition.getClassType());
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.definition.getClassType() << 16) | stack2.definition.getClassType());
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             }
-            for (cElementalInstanceStack newStack : map.valuesToArray()) {
-                check &= newStack.definition.fusionMakesEnergy(newStack.getEnergy());
+            for (EMInstanceStack newStack : map.valuesToArray()) {
+                check &= newStack.getDefinition().fusionMakesEnergy(newStack.getEnergy());
             }
             //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new cElementalInstanceStackMap[]{map};
+            outputEM = new EMInstanceStackMap[]{map};
 
             partner.stack = stack = null;
             //System.out.println("check = " + check);
@@ -410,21 +410,21 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     protected double collide(GT_MetaTileEntity_EM_collider partner) {//DOES NOT MAKE EU!
         if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            cElementalInstanceStack stack2 = partner.stack;
-            double preMass = stack2.getMass() + stack.getMass();
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = stack2.getMass() + stack.getMass();
             //System.out.println("preMass = " + preMass);
 
-            cElementalInstanceStackMap map = new cElementalInstanceStackMap();
-            IColliderHandler colliderHandler;
-            if (stack2.definition.getClassType() > stack.definition.getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.definition.getClassType() << 16) | stack.definition.getClassType());
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.definition.getClassType() << 16) | stack2.definition.getClassType());
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
                 if (handleRecipe(stack2, map, colliderHandler)) return 0;
             }
             //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new cElementalInstanceStackMap[]{map};
+            outputEM = new EMInstanceStackMap[]{map};
 
             partner.stack = stack = null;
             //System.out.println("check = " + check);
@@ -434,12 +434,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         return 0;
     }
 
-    private boolean handleRecipe(cElementalInstanceStack stack2, cElementalInstanceStackMap map, IColliderHandler colliderHandler) {
+    private boolean handleRecipe(EMInstanceStack stack2, EMInstanceStackMap map, IColliderHandler colliderHandler) {
         if (colliderHandler != null && eTier >= colliderHandler.getRequiredTier()) {
             colliderHandler.collide(stack2, stack, map);
         } else {
             map.putUnifyAll(stack, stack2);
-            outputEM = new cElementalInstanceStackMap[]{map};
+            outputEM = new EMInstanceStackMap[]{map};
             return true;
         }
         return false;
@@ -472,16 +472,17 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         }
     }
 
-    private cElementalInstanceStackMap tickStack() {
+    private EMInstanceStackMap tickStack() {
         if (stack == null) {
             return null;
         }
-        cElementalDecayResult newInstances = stack.decay(1, stack.age += 1, 0);
+        stack.setAge(stack.getAge() + 1);
+        EMDecayResult newInstances = stack.decay(1, stack.getAge(), 0);
         if (newInstances == null) {
             stack.nextColor();
             return null;
         } else {
-            stack = newInstances.getOutput().remove(newInstances.getOutput().getLast().definition);
+            stack = newInstances.getOutput().removeKey(newInstances.getOutput().getLast().getDefinition());
             return newInstances.getOutput();
         }
     }
@@ -525,12 +526,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         if (started) {
             if (stack == null) {
                 for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
-                    cElementalInstanceStackMap container = inputElemental.getContentHandler();
+                    EMInstanceStackMap container = inputElemental.getContentHandler();
                     if (container.isEmpty()) {
                         continue;
                     }
-                    stack = container.remove(container.getFirst().definition);
-                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / dAtomDefinition.getSomethingHeavy().getMass())) / 2;
+                    stack = container.removeKey(container.getFirst().getDefinition());
+                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / EMAtomDefinition.getSomethingHeavy().getMass())) / 2;
                     if (eut < Integer.MIN_VALUE + 7) {
                         return false;
                     }
@@ -575,12 +576,12 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                     collide(partner);//todo
                     break;
                 default: {
-                    outputEM = new cElementalInstanceStackMap[2];
+                    outputEM = new EMInstanceStackMap[2];
                     outputEM[1] = tickStack();
                     if (outputEM[1] == null) {
                         outputEM[1] = partner.tickStack();
                     } else {
-                        cElementalInstanceStackMap map = partner.tickStack();
+                        EMInstanceStackMap map = partner.tickStack();
                         if (map != null) {
                             outputEM[1].putUnifyAll(map);
                         }
@@ -659,7 +660,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         eTier = aNBT.getByte("eTier");//collider tier
         started = aNBT.getBoolean("eStarted");
         if (aNBT.hasKey("eStack")) {
-            stack = cElementalInstanceStack.fromNBT(aNBT.getCompoundTag("eStack"));
+            stack = EMInstanceStack.fromNBT(aNBT.getCompoundTag("eStack"));
         }
         plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index ed245b0e97..84dafb8db2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
@@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
@@ -115,7 +115,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
-        cElementalInstanceStackMap map = getInputsClone_EM();
+        EMInstanceStackMap map = getInputsClone_EM();
         if (map != null && map.hasStacks()) {
             for (GT_MetaTileEntity_Hatch_InputElemental i : eInputHatches) {
                 i.getContentHandler().clear();
@@ -125,20 +125,20 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
         return false;
     }
 
-    private boolean startRecipe(cElementalInstanceStackMap input) {
+    private boolean startRecipe(EMInstanceStackMap input) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
-        outputEM = new cElementalInstanceStackMap[2];
+        outputEM = new EMInstanceStackMap[2];
         outputEM[0] = input;
-        outputEM[1] = new cElementalInstanceStackMap();
+        outputEM[1] = new EMInstanceStackMap();
 
-        for (cElementalInstanceStack stack : outputEM[0].valuesToArray()) {
-            if (stack.getEnergy() == 0 && stack.definition.decayMakesEnergy(1) &&
+        for (EMInstanceStack stack : outputEM[0].valuesToArray()) {
+            if (stack.getEnergy() == 0 && stack.getDefinition().decayMakesEnergy(1) &&
                     getBaseMetaTileEntity().decreaseStoredEnergyUnits(
                             (long) (stack.getEnergySettingCost(1) * URANIUM_MASS_TO_EU_INSTANT), false)) {
                 stack.setEnergy(1);
-            } else if (!stack.definition.decayMakesEnergy(stack.getEnergy())) {
-                outputEM[0].remove(stack.definition);
+            } else if (!stack.getDefinition().decayMakesEnergy(stack.getEnergy())) {
+                outputEM[0].removeKey(stack.getDefinition());
                 outputEM[1].putReplace(stack);
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 208219cd59..466f82071b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -26,9 +26,9 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refMass;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -72,7 +72,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         super(aName);
     }
 
-    private void startRecipe(iElementalStack from, long energy) {
+    private void startRecipe(IEMStack from, long energy) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = from.getMass();
@@ -98,12 +98,12 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-            cElementalInstanceStackMap map = in.getContentHandler();
-            for (cElementalInstanceStack stack : map.valuesToArray()) {
+            EMInstanceStackMap map = in.getContentHandler();
+            for (EMInstanceStack stack : map.valuesToArray()) {
                 {
-                    aFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
+                    EMFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
                     if (info != null) {
-                        if (map.removeAllAmounts(false, info.input())) {
+                        if (map.removeAllAmounts(info.input())) {
                             mOutputFluids = new FluidStack[]{info.output()};
                             startRecipe(info.input(), stack.getEnergy());
                             return true;
@@ -111,9 +111,9 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
                     }
                 }
                 {
-                    aItemDequantizationInfo info = stack.getDefinition().someAmountIntoItemsStack();
+                    EMItemDequantizationInfo info = stack.getDefinition().someAmountIntoItemsStack();
                     if (info != null) {
-                        if (map.removeAllAmounts(false, info.input())) {
+                        if (map.removeAllAmounts(info.input())) {
                             mOutputItems = new ItemStack[]{info.output()};
                             startRecipe(info.input(), stack.getEnergy());
                             return true;
@@ -121,10 +121,10 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
                     }
                 }
                 {
-                    aOredictDequantizationInfo info = stack.getDefinition().someAmountIntoOredictStack();
+                    EMOredictDequantizationInfo info = stack.getDefinition().someAmountIntoOredictStack();
                     if (info != null) {
-                        if (map.removeAllAmounts(false, info.input())) {
-                            ArrayList<ItemStack> items = OreDictionary.getOres(info.out);
+                        if (map.removeAllAmounts(info.input())) {
+                            ArrayList<ItemStack> items = OreDictionary.getOres(info.getOut());
                             if (items != null && !items.isEmpty()) {
                                 mOutputItems = new ItemStack[]{items.get(0)};
                                 startRecipe(info.input(), stack.getEnergy());
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index f5504eadc7..630569a25d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -3,12 +3,12 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.iElementalStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aFluidQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aItemQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.aOredictQuantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidQuantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemQuantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictQuantizationInfo;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -29,11 +29,11 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.DEFAULT_ENERGY_LEVEL;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.TRANSFORMATION_INFO;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refMass;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition.refUnstableMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.DEFAULT_ENERGY_LEVEL;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullFluid;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
@@ -98,9 +98,9 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
-                    aItemQuantizationInfo aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, false, null));
+                    EMItemQuantizationInfo aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, false, null));
                     if (aIQI == null) {
-                        aIQI = TRANSFORMATION_INFO.itemQuantization.get(new aItemQuantizationInfo(is, true, null));//todo check if works?
+                        aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, true, null));//todo check if works?
                     }
                     if (aIQI == null) {
                         //ORE DICT quantization //todo fix for uranium?
@@ -109,12 +109,12 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (DEBUG_MODE) {
                                 TecTech.LOGGER.info("Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage() + ' ' + OreDictionary.getOreName(ID));
                             }
-                            aOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.oredictQuantization.get(ID);
+                            EMOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.getOredictQuantization().get(ID);
                             if (aOQI == null) {
                                 continue;
                             }
-                            iElementalStack into = aOQI.output();
-                            if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.amount, is.getItemDamage())}, null, inI)) {
+                            IEMStack into = aOQI.output();
+                            if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.getAmount(), is.getItemDamage())}, null, inI)) {
                                 startRecipe(into);
                                 return true;
                             }
@@ -124,7 +124,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                         if (DEBUG_MODE) {
                             TecTech.LOGGER.info("Quantifier-Item-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage());
                         }
-                        iElementalStack into = aIQI.output();
+                        IEMStack into = aIQI.output();
                         if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aIQI.input().stackSize, is.getItemDamage())}, null, inI)) {
                             startRecipe(into);
                             return true;
@@ -136,11 +136,11 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             FluidStack[] inF = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
-                    aFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.fluidQuantization.get(fs.getFluid().getID());
+                    EMFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.getFluidQuantization().get(fs.getFluid().getID());
                     if (aFQI == null) {
                         continue;
                     }
-                    iElementalStack into = aFQI.output();
+                    IEMStack into = aFQI.output();
                     if (into != null && fs.amount >= aFQI.input().amount && isInputEqual(true, false,
                             new FluidStack[]{aFQI.input()}, nullItem, inF, (ItemStack[]) null)) {
                         startRecipe(into);
@@ -152,7 +152,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         return false;
     }
 
-    private void startRecipe(iElementalStack into) {
+    private void startRecipe(IEMStack into) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
         double mass = into.getMass();
@@ -163,10 +163,10 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
         } else {
             mEUt = (int) -V[6];
         }
-        outputEM = new cElementalInstanceStackMap[]{
-                into instanceof cElementalInstanceStack ?
-                        new cElementalInstanceStackMap((cElementalInstanceStack) into) :
-                        new cElementalInstanceStackMap(new cElementalInstanceStack(into.getDefinition(), into.getAmount()))
+        outputEM = new EMInstanceStackMap[]{
+                into instanceof EMInstanceStack ?
+                        new EMInstanceStackMap((EMInstanceStack) into) :
+                        new EMInstanceStackMap(new EMInstanceStack(into.getDefinition(), into.getAmount()))
         };
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index d02088e805..74bb817142 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -2,10 +2,10 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.recipe.TT_recipe;
@@ -35,7 +35,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipe.E_RECIPE_ID;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
@@ -59,9 +59,9 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             SCAN_GET_COLOR = 256, SCAN_GET_AGE = 512, SCAN_GET_TIMESPAN_MULT = 1024, SCAN_GET_CLASS_TYPE = 2048;
 
     private TT_recipe.TT_EMRecipe.TT_EMRecipe eRecipe;
-    private cElementalDefinitionStack objectResearched;
-    private cElementalInstanceStackMap objectsScanned;
-    private String machineType;
+    private EMDefinitionStack                 objectResearched;
+    private EMInstanceStackMap                objectsScanned;
+    private String                    machineType;
     private long computationRemaining, computationRequired;
     private int[] scanComplexity;
 
@@ -219,31 +219,31 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     public boolean checkRecipe_EM(ItemStack itemStack) {
         eRecipe = null;
         if (!eInputHatches.isEmpty() && eInputHatches.get(0).getContentHandler().hasStacks() && !eOutputHatches.isEmpty()) {
-            cElementalInstanceStackMap researchEM = eInputHatches.get(0).getContentHandler();
+            EMInstanceStackMap researchEM = eInputHatches.get(0).getContentHandler();
             if (ItemList.Tool_DataOrb.isStackEqual(itemStack, false, true)) {
                 GT_Recipe scannerRecipe = null;
-                for (cElementalInstanceStack stackEM : researchEM.valuesToArray()) {
+                for (EMInstanceStack stackEM : researchEM.valuesToArray()) {
                     objectsScanned = null;
-                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.definition);
+                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(stackEM.getDefinition());
                     if (eRecipe != null) {
                         scannerRecipe = eRecipe.scannerRecipe;
                         machineType = machine;
-                        objectResearched = new cElementalDefinitionStack(stackEM.definition, 1);
+                        objectResearched = new EMDefinitionStack(stackEM.getDefinition(), 1);
                         //cleanMassEM_EM(objectResearched.getMass());
-                        researchEM.remove(objectResearched.definition);
+                        researchEM.removeKey(objectResearched.getDefinition());
                         break;
                     }
-                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(stackEM.definition);
+                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(stackEM.getDefinition());
                     if (eRecipe != null) {
                         scannerRecipe = eRecipe.scannerRecipe;
                         machineType = crafter;
-                        objectResearched = new cElementalDefinitionStack(stackEM.definition, 1);
+                        objectResearched = new EMDefinitionStack(stackEM.getDefinition(), 1);
                         //cleanMassEM_EM(objectResearched.getMass());
-                        researchEM.remove(objectResearched.definition);
+                        researchEM.removeKey(objectResearched.getDefinition());
                         break;
                     }
                     cleanStackEM_EM(stackEM);
-                    researchEM.remove(stackEM.definition);
+                    researchEM.removeKey(stackEM.getDefinition());
                 }
                 if (eRecipe != null && scannerRecipe != null) {//todo make sure it werks
                     computationRequired = computationRemaining = scannerRecipe.mDuration * 20L;
@@ -409,8 +409,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         computationRemaining = aNBT.getLong("eComputationRemaining");
         computationRequired = aNBT.getLong("eComputationRequired");
         if (aNBT.hasKey("eObject")) {
-            objectResearched = cElementalDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject"));
-            if (objectResearched.definition == nbtE__) {
+            objectResearched = EMDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject"));
+            if (objectResearched.getDefinition() == nbtE__) {
                 objectResearched = null;
             }
         } else {
@@ -423,10 +423,10 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         }
         try {
             if (aNBT.hasKey("eScanObjects")) {
-                objectsScanned = cElementalInstanceStackMap.fromNBT(aNBT.getCompoundTag("eScanObjects"));
+                objectsScanned = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eScanObjects"));
             }
-        } catch (tElementalException e) {
-            objectsScanned = new cElementalInstanceStackMap();
+        } catch (EMException e) {
+            objectsScanned = new EMInstanceStackMap();
         }
     }
 
@@ -445,11 +445,11 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             if (computationRemaining > 0 && objectResearched != null) {
                 eRecipe = null;
                 if (ItemList.Tool_DataOrb.isStackEqual(mInventory[1], false, true)) {
-                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.definition);
+                    eRecipe = TT_recipe.TT_Recipe_Map_EM.sMachineRecipesEM.findRecipe(objectResearched.getDefinition());
                     if (eRecipe != null) {
                         machineType = machine;
                     } else {
-                        eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.definition);
+                        eRecipe = TT_recipe.TT_Recipe_Map_EM.sCrafterRecipesEM.findRecipe(objectResearched.getDefinition());
                         if (eRecipe != null) {
                             machineType = crafter;
                         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index ba6ae223f6..9a6f99bed8 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -10,10 +10,10 @@ import com.github.technus.tectech.mechanics.alignment.IAlignmentLimits;
 import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
 import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
 import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
@@ -109,7 +109,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
     //storage for output EM that will be auto handled in case of failure to finish recipe
     //if you succed to use a recipe - be sure to output EM from outputEM to hatches in the output method
-    protected cElementalInstanceStackMap[] outputEM;
+    protected EMInstanceStackMap[] outputEM;
 
     //are parameters correct - change in check recipe/output/update params etc. (maintenance status boolean)
     protected boolean eParameters = true;
@@ -842,13 +842,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
         int outputLen = aNBT.getInteger("eOutputStackCount");
         if (outputLen > 0) {
-            outputEM = new cElementalInstanceStackMap[outputLen];
+            outputEM = new EMInstanceStackMap[outputLen];
             NBTTagCompound compound = aNBT.getCompoundTag("outputEM");
             for (int i = 0; i < outputEM.length; i++) {
                 if (compound.hasKey(Integer.toString(i))) {
                     try {
-                        outputEM[i] = cElementalInstanceStackMap.fromNBT(compound.getCompoundTag(Integer.toString(i)));
-                    } catch (tElementalException e) {
+                        outputEM[i] = EMInstanceStackMap.fromNBT(compound.getCompoundTag(Integer.toString(i)));
+                    } catch (EMException e) {
                         if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
@@ -966,7 +966,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     private void cleanOrExplode() {
         if (outputEM != null) {
             float mass = 0;
-            for (cElementalInstanceStackMap tree : outputEM) {
+            for (EMInstanceStackMap tree : outputEM) {
                 if (tree != null) {
                     mass += tree.getMass();
                 }
@@ -1155,7 +1155,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                         explodeMultiblock();
                     }
                     if (outputEM != null) {
-                        for (cElementalInstanceStackMap tree : outputEM) {
+                        for (EMInstanceStackMap tree : outputEM) {
                             if (tree != null && tree.hasStacks()) {
                                 explodeMultiblock();
                             }
@@ -1297,26 +1297,26 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             }
             double remaining = voider.overflowMax - voider.getOverflowMatter();
             for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
-                for (cElementalInstanceStack instance : in.getContentHandler().valuesToArray()) {
-                    double qty = div(remaining,instance.definition.getMass());
+                for (EMInstanceStack instance : in.getContentHandler().valuesToArray()) {
+                    double qty = div(remaining, instance.getDefinition().getMass());
                     if (qty > 0) {
-                        qty = min(qty, instance.amount);
-                        if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
+                        qty = min(qty, instance.getAmount());
+                        if (voider.addOverflowMatter(instance.getDefinition().getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        in.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        in.getContentHandler().removeAmount(new EMDefinitionStack(instance.getDefinition(), qty));
                     }
                 }
             }
             for (GT_MetaTileEntity_Hatch_OutputElemental out : eOutputHatches) {
-                for (cElementalInstanceStack instance : out.getContentHandler().valuesToArray()) {
-                    double qty = div(remaining,instance.definition.getMass());
+                for (EMInstanceStack instance : out.getContentHandler().valuesToArray()) {
+                    double qty = div(remaining, instance.getDefinition().getMass());
                     if (qty > 0) {
-                        qty = min(qty, instance.amount);
-                        if (voider.addOverflowMatter(instance.definition.getMass() * qty)) {
+                        qty = min(qty, instance.getAmount());
+                        if (voider.addOverflowMatter(instance.getDefinition().getMass() * qty)) {
                             voider.setOverflowMatter(voider.overflowMax);
                         }
-                        out.getContentHandler().removeAmount(false, new cElementalDefinitionStack(instance.definition, qty));
+                        out.getContentHandler().removeAmount(new EMDefinitionStack(instance.getDefinition(), qty));
                     }
                 }
             }
@@ -1929,8 +1929,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
 
     //region convenience copies input and output EM
     //new Method
-    public final cElementalInstanceStackMap getInputsClone_EM() {
-        cElementalInstanceStackMap in = new cElementalInstanceStackMap();
+    public final EMInstanceStackMap getInputsClone_EM() {
+        EMInstanceStackMap in = new EMInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eInputHatches) {
             in.putUnifyAll(hatch.getContentHandler());
         }
@@ -1938,8 +1938,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     }
 
     //new Method
-    public final cElementalInstanceStackMap getOutputsClone_EM() {
-        cElementalInstanceStackMap out = new cElementalInstanceStackMap();
+    public final EMInstanceStackMap getOutputsClone_EM() {
+        EMInstanceStackMap out = new EMInstanceStackMap();
         for (GT_MetaTileEntity_Hatch_ElementalContainer hatch : eOutputHatches) {
             out.putUnifyAll(hatch.getContentHandler());
         }
@@ -1974,7 +1974,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         cleanMassEM_EM(target.getContentHandler().getMass());
     }
 
-    public void cleanStackEM_EM(cElementalInstanceStack target) {
+    public void cleanStackEM_EM(EMInstanceStack target) {
         if (target == null) {
             return;
         }
@@ -2006,7 +2006,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             return;
         }
         float mass = 0;
-        for (cElementalInstanceStackMap map : outputEM) {
+        for (EMInstanceStackMap map : outputEM) {
             if (map != null) {
                 mass += map.getMass();
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
index 093a418056..d1eafa22fc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
@@ -1,9 +1,9 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
@@ -12,7 +12,8 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import java.util.Arrays;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.DoubleCount.*;
@@ -74,7 +75,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         radius = 0.5D - (12D - tier) / 64D;
         maxRCF = Math.pow(Math.E, tier) * 12D;
         maxRPM = Math.sqrt(maxRCF / (0.001118D * radius));
-        double maxSafeMass = dAtomDefinition.getSomethingHeavy().getMass() * (1 << tier);
+        double maxSafeMass = EMAtomDefinition.getSomethingHeavy().getMass() * (1 << tier);
         maxForce = maxSafeMass * maxRCF;// (eV/c^2 * m/s) / g
         maxCapacity = maxSafeMass * AVOGADRO_CONSTANT_144 * radius;// eV/c^2
     }
@@ -83,12 +84,12 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         return RPM * RPM * radius * 0.001118;
     }
 
-    private void addRandomly(cElementalInstanceStack me, cElementalInstanceStackMap[] toThis, int fractionCount) {
-        double amountPerFraction = div(me.amount,fractionCount);
-        cElementalInstanceStack[] stacks = new cElementalInstanceStack[fractionCount];
+    private void addRandomly(EMInstanceStack me, EMInstanceStackMap[] toThis, int fractionCount) {
+        double            amountPerFraction = div(me.getAmount(),fractionCount);
+        EMInstanceStack[] stacks            = new EMInstanceStack[fractionCount];
         for (int i = 0; i < fractionCount; i++) {
             stacks[i] = me.clone();
-            stacks[i].amount = amountPerFraction;
+            stacks[i].setAmount(amountPerFraction);
             toThis[i].putReplace(stacks[i]);
         }
         //int remainingAmount = (int) (me.amount % fractionCount);
@@ -112,23 +113,23 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
-        cElementalInstanceStackMap input = inputs[0];
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+        EMInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.valuesToArray();
+        EMInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
-        for (cElementalInstanceStack stack : stacks) {
+        for (EMInstanceStack stack : stacks) {
             inputMass += Math.abs(stack.getMass());
         }
         double excessMass = 0;
         while (inputMass > maxCapacity) {
-            cElementalInstanceStack randomStack = stacks[TecTech.RANDOM.nextInt(stacks.length)];
-            double amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
-            randomStack.amount= sub(randomStack.amount,amountToRemove);//mutates the parent InstanceStackMap
-            if (randomStack.amount <= 0) {
-                input.remove(randomStack.definition);
+            EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
+            double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
+            randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
+            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+                input.removeKey(randomStack.getDefinition());
                 stacks = input.valuesToArray();
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
@@ -142,10 +143,10 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         if (inputMass * RCF > maxForce) return new MultiblockControl<>(excessMass);//AND THEN IT EXPLODES
 
         // how many output hatches to use
-        int fractionCount = (int) settingFraction.get();
-        cElementalInstanceStackMap[] outputs = new cElementalInstanceStackMap[fractionCount];
+        int                  fractionCount = (int) settingFraction.get();
+        EMInstanceStackMap[] outputs       = new EMInstanceStackMap[fractionCount];
         for (int i = 0; i < fractionCount; i++) {
-            outputs[i] = new cElementalInstanceStackMap();
+            outputs[i] = new EMInstanceStackMap();
         }
 
         //mixing factor...
@@ -165,21 +166,21 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         stacks = input.takeAll().valuesToArray();//cleanup stacks
         if (stacks.length > 1) {
             Arrays.sort(stacks, (o1, o2) -> {
-                double m1 = o1.definition.getMass();
-                double m2 = o2.definition.getMass();
+                double m1 = o1.getDefinition().getMass();
+                double m2 = o2.getDefinition().getMass();
                 if (m1 < m2) return -1;
                 if (m1 > m2) return 1;
                 return o1.compareTo(o2);
             });
 
             double absMassPerOutput = 0;//"volume"
-            for (cElementalInstanceStack stack : stacks) {
+            for (EMInstanceStack stack : stacks) {
                 double tempMass=Math.abs(stack.getMass());
                 if(tempMass!=0) {
-                    double amount = stack.amount;
-                    stack.amount = mul(stack.amount,mixingFactor);
+                    double amount = stack.getAmount();
+                    stack.setAmount(mul(stack.getAmount(),mixingFactor));
                     addRandomly(stack, outputs, fractionCount);
-                    stack.amount = sub(amount,stack.amount);
+                    stack.setAmount(sub(amount, stack.getAmount()));
                     absMassPerOutput += tempMass;
                 }
             }
@@ -197,7 +198,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
                 for (int stackNo = 0; stackNo < stacks.length; stackNo++) {
                     if (stacks[stackNo] != null) {
                         double stackMass = Math.abs(stacks[stackNo].getMass());
-                        double amount = div(remaining,Math.abs(stacks[stackNo].definition.getMass()));
+                        double amount = div(remaining,Math.abs(stacks[stackNo].getDefinition().getMass()));
                         //if(DEBUG_MODE){
                         //    TecTech.LOGGER.info("stackMass "+stackMass);
                         //    TecTech.LOGGER.info("defMass "+stacks[stackNo].definition.getMass());
@@ -207,16 +208,16 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
                         if (stackMass == 0) {
                             addRandomly(stacks[stackNo], outputs, fractionCount);
                             stacks[stackNo] = null;
-                        } else if (amount >= stacks[stackNo].amount) {
+                        } else if (amount >= stacks[stackNo].getAmount()) {
                             remaining= sub(remaining,stackMass);
                             outputs[fraction].putUnify(stacks[stackNo]);
                             stacks[stackNo] = null;
                         } else if (amount > 0) {
-                            remaining= sub(remaining, mul(amount,stacks[stackNo].definition.getMass()));
-                            cElementalInstanceStack clone = stacks[stackNo].clone();
-                            clone.amount = amount;
+                            remaining= sub(remaining, mul(amount, stacks[stackNo].getDefinition().getMass()));
+                            EMInstanceStack clone = stacks[stackNo].clone();
+                            clone.setAmount(amount);
                             outputs[fraction].putUnify(clone);
-                            stacks[stackNo].amount= sub(stacks[stackNo].amount,amount);
+                            stacks[stackNo].setAmount(sub(stacks[stackNo].getAmount(),amount));
                             //if(DEBUG_MODE){
                             //    TecTech.LOGGER.info("remainingAfter "+remaining);
                             //    TecTech.LOGGER.info("amountCloneAfter "+clone.amount+"/"+stacks[stackNo].amount);
@@ -228,7 +229,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
                 }
             }
             //add remaining
-            for (cElementalInstanceStack stack : stacks) {
+            for (EMInstanceStack stack : stacks) {
                 if (stack != null) {
                     outputs[fractionCount - 1].putUnify(stack);
                 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
index d335bac7ab..4c95c2acd7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Electrolyzer.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -24,7 +24,7 @@ public class Behaviour_Electrolyzer implements GT_MetaTileEntity_EM_machine.IBeh
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
index 6ac6ac74c4..70d93b36ed 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
@@ -1,15 +1,16 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.dAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.bTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.DoubleCount.mul;
@@ -88,7 +89,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
     public Behaviour_ElectromagneticSeparator(int desiredTier){
         tier=(byte) desiredTier;
         ticks =Math.max(20,(1<<(12-desiredTier))*20);
-        maxCapacity= dAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* AVOGADRO_CONSTANT_144;
+        maxCapacity= EMAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* AVOGADRO_CONSTANT_144;
         maxCharge=144D*(1<<(tier-5));
         switch (tier){
             case 12:
@@ -143,23 +144,23 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
-        cElementalInstanceStackMap input = inputs[0];
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+        EMInstanceStackMap input = inputs[0];
         if (input == null || input.isEmpty()) return null;//nothing in only valid input
 
-        cElementalInstanceStack[] stacks = input.valuesToArray();
+        EMInstanceStack[] stacks = input.valuesToArray();
 
         double inputMass = 0;
-        for (cElementalInstanceStack stack : stacks) {
+        for (EMInstanceStack stack : stacks) {
             inputMass += Math.abs(stack.getMass());
         }
         float excessMass = 0;
         while (inputMass > maxCapacity) {
-            cElementalInstanceStack randomStack = stacks[TecTech.RANDOM.nextInt(stacks.length)];
-            double amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
-            randomStack.amount= sub(randomStack.amount,amountToRemove);//mutates the parent InstanceStackMap
-            if (randomStack.amount <= 0) {
-                input.remove(randomStack.definition);
+            EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
+            double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
+            randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
+            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+                input.removeKey(randomStack.getDefinition());
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
             excessMass += mass;
@@ -174,9 +175,9 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
         int mTicks=(int)(ticks*(inputMass/maxCapacity));
         mTicks=Math.max(mTicks,20);
 
-        cElementalInstanceStackMap[] outputs = new cElementalInstanceStackMap[3];
+        EMInstanceStackMap[] outputs = new EMInstanceStackMap[3];
         for (int i = 0; i < 3; i++) {
-            outputs[i] = new cElementalInstanceStackMap();
+            outputs[i] = new EMInstanceStackMap();
         }
 
         double offsetIn=offsetSetting.get();
@@ -186,8 +187,8 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
 
         //take all from hatch handler and put into new map - this takes from hatch to inner data storage
         stacks = input.takeAll().valuesToArray();//cleanup stacks
-        for(cElementalInstanceStack stack:stacks){
-            double charge=stack.definition.getCharge()-offsetIn;
+        for(EMInstanceStack stack:stacks){
+            double charge= stack.getDefinition().getCharge()-offsetIn;
             if(charge<precisionMinimalIn && charge>-precisionMinimalIn){
                 outputs[1].putReplace(stack);
             }else if(charge>=precisionFullIn){
@@ -195,13 +196,13 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
             }else if(charge<=-precisionFullIn){
                 outputs[0].putReplace(stack);
             }else{
-                double amount=mul(stack.amount,(Math.abs(charge)-precisionMinimalIn+1D)/levelsCountPlus1);//todo check
-                if (amount < stack.amount) {
-                    cElementalInstanceStack clone = stack.clone();
-                    clone.amount = sub(clone.amount, amount);
+                double amount=mul(stack.getAmount(),(Math.abs(charge)-precisionMinimalIn+1D)/levelsCountPlus1);//todo check
+                if (amount < stack.getAmount()) {
+                    EMInstanceStack clone = stack.clone();
+                    clone.setAmount(sub(clone.getAmount(), amount));
                     outputs[1].putReplace(clone);
 
-                    stack.amount = amount;
+                    stack.setAmount(amount);
                 }
                 if(charge>0){
                     outputs[2].putReplace(stack);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
index 97ece16fb1..7d472de847 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_PrecisionLaser.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -24,7 +24,7 @@ public class Behaviour_PrecisionLaser implements GT_MetaTileEntity_EM_machine.IB
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
index f7aa945d69..05050a3c66 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Recycler.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -26,9 +26,9 @@ public class Behaviour_Recycler implements GT_MetaTileEntity_EM_machine.IBehavio
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         double mass=0;
-        for (cElementalInstanceStackMap input : inputs) {
+        for (EMInstanceStackMap input : inputs) {
             if (input != null) {
                 mass += input.getMass();
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
index 2dc9067e22..fa517c73d4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Scanner.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
@@ -24,7 +24,7 @@ public class Behaviour_Scanner implements GT_MetaTileEntity_EM_machine.IBehaviou
     }
 
     @Override
-    public MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
+    public MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters) {
         return null;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index d9217171d3..e653c1a357 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.cElementalInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -161,7 +161,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
          * @param parameters array passed from previous method!
          * @return null if recipe should not start, control object to set machine state and start recipe
          */
-        MultiblockControl<cElementalInstanceStackMap[]> process(cElementalInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters);
+        MultiblockControl<EMInstanceStackMap[]> process(EMInstanceStackMap[] inputs, GT_MetaTileEntity_EM_machine te, Parameters parameters);
     }
 
     private void quantumStuff(boolean shouldIExist) {
@@ -254,7 +254,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             return false;
         }
 
-        cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6];
+        EMInstanceStackMap[] handles = new EMInstanceStackMap[6];
         for (int i = 0; i < 6; i++) {
             int pointer = (int) inputMux[i].get();
             if (pointer >= 0 && pointer < eInputHatches.size()) {
@@ -272,7 +272,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             }
         }
 
-        MultiblockControl<cElementalInstanceStackMap[]> control = currentBehaviour.process(handles, this, parametrization);
+        MultiblockControl<EMInstanceStackMap[]> control = currentBehaviour.process(handles, this, parametrization);
         if (control == null) {
             return false;
         }
@@ -311,7 +311,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             return;
         }
 
-        cElementalInstanceStackMap[] handles = new cElementalInstanceStackMap[6];
+        EMInstanceStackMap[] handles = new EMInstanceStackMap[6];
         for (int i = 0; i < 6; i++) {
             int pointer = (int) outputMux[i].get();
             if (pointer >= 0 && pointer < eOutputHatches.size()) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo
index 7059fdf6fd..a195157a17 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo	
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo	
@@ -23,16 +23,16 @@ BlockFakeLight.java
 for turrets:
 floodlightb
 
+mega - projects
+
 
 
 fix eu/t checks if needs maintenance!!!
 
 make microwave grinder cap autosmelting based on power
 
-
 iterative halflife formula:
 
 =prev qty* 2^(-t diff / t half)
 
-
 actual ion cannons
diff --git a/src/main/java/com/github/technus/tectech/util/DoubleCount.java b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
index b37c0987ae..576123079c 100644
--- a/src/main/java/com/github/technus/tectech/util/DoubleCount.java
+++ b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
@@ -3,26 +3,40 @@ package com.github.technus.tectech.util;
 import java.util.Arrays;
 
 import static java.lang.Math.*;
-import static java.lang.Math.max;
-import static java.lang.Math.ulp;
 
 public class DoubleCount {
-    public static double[] distribute(double count,double... probabilities) throws ArithmeticException {
-        if (probabilities == null) {
+    /**
+     * Distributes count across probabilities
+     *
+     * @param count         the count to divide
+     * @param probabilities probability ratios to divide by, descending
+     * @return divided count
+     * @throws ArithmeticException
+     */
+    public static double[] distribute(double count, double... probabilities) throws ArithmeticException {
+        if (probabilities == null || Double.isNaN(count)) {
             return null;
         } else if (count == 0) {
             return new double[probabilities.length];
+        } else if (Double.isInfinite(count)) {
+            double[] doubles = new double[probabilities.length];
+            Arrays.fill(doubles, count);
+            return doubles;
         } else {
             switch (probabilities.length) {
                 default: {
-                    int size = probabilities.length;
+                    int      size   = probabilities.length;
                     double[] output = new double[size];
                     size--;
-                    double remaining = count, previous = probabilities[size], probability, out, sum = 0;
+                    double remaining = count, previous = probabilities[size], probability, out;
                     for (int i = size - 1; i >= 0; i--) {
                         probability = probabilities[i];
-                        remaining -= out = count * probability - ulp(probability);
-                        sum += output[i] = out;
+                        out = count * probability;
+                        out -= ulpSigned(out);
+
+                        remaining -= out;
+                        output[i] = out;
+
                         if (previous < probability) {
                             throw new ArithmeticException("Malformed probability order: " + Arrays.toString(probabilities));
                         }
@@ -31,14 +45,10 @@ public class DoubleCount {
                             break;
                         }
                     }
-                    if (remaining * count < 0) {
+                    if (remaining * count < 0) {//overshoot
                         finishIt(size, output, remaining);
                     } else {
-                        sum += output[size] = remaining - ulp(remaining) * size;
-                        if (sum > count) {
-                            remaining = sum - count;
-                            finishIt(size, output, remaining);
-                        }
+                        output[size] = remaining;
                     }
                     return output;
                 }
@@ -50,84 +60,58 @@ public class DoubleCount {
         }
     }
 
+    public static double ulpSigned(double number) {
+        if (number == 0) {
+            return 0;
+        }
+        return number > 0 ? ulp(number) : -ulp(number);
+    }
+
     private static void finishIt(int size, double[] output, double remaining) {
         for (int i = size - 1; i >= 0; i--) {
             if (abs(output[i]) >= abs(remaining)) {
                 output[i] -= remaining;
                 break;
             } else {
-                remaining+=output[i];
-                output[i]=0;
+                remaining += output[i];
+                output[i] = 0;
             }
         }
     }
 
-    public static double div(double count,double divisor){
-        if (divisor == 0) {
-            throw new ArithmeticException("Divide by 0");
-        }else if(count==0 || divisor==1){
-            return count;
-        }else if(divisor==-1){
-            return -count;
+    public static double div(double count, double divisor) {
+        if (count == 0 || abs(divisor) == 1 || abs(count)==abs(divisor)) {
+            return count/divisor;
         } else {
             double result = count / divisor;
-            if(result*count<0){
-                return 0;
-            }
-            return result-ulp(result);
+            return result - ulpSigned(result);
         }
     }
 
-    public static double mul(double count,double multiplier){
-        if(count==0 || multiplier==1){
-            return count;
-        }else if(multiplier==-1){
-            return -count;
+    public static double mul(double count, double multiplier) {
+        if (count == 0 || multiplier == 0 || abs(multiplier)==1 || abs(count)==1) {
+            return count*multiplier;
         } else {
             double result = count * multiplier;
-            if(result*count<0){
-                return 0;
-            }
-            return result-ulp(result);
+            return result - ulpSigned(result);
         }
     }
 
-    public static double sub(double count,double value){
-        if(value==0){
-            return count;
-        }
-        if(count==0){
-            return -value;
-        }
-        if(value==count){
-            return 0;
-        }
-        return value < 0 ? addInternal(count, -value) : subInternal(count, value);
-    }
-
-    public static double add(double count,double value){
-        if(value==0){
-            return count;
-        }
-        if(count==0){
-            return value;
-        }
-        return value < 0 ? subInternal(count, -value) : addInternal(count, value);
-    }
-
-    private static double subInternal(double count,double value){
-        double result = count - max(value,ulp(count));
-        if (result+value>count || value>count-result){
-            result-=ulp(result);
+    public static double sub(double count, double value) {
+        if (count == 0 || value == 0 || count == value) {
+            return count - value;
+        } else {
+            double result = count - value;
+            return result - ulpSigned(result);
         }
-        return result;
     }
 
-    private static double addInternal(double count,double value){
-        double result = count + value;
-        if (result-value>count || result-count>value){
-            result-=ulp(result);
+    public static double add(double count, double value) {
+        if (count == 0 || value == 0 || count == -value) {
+            return count + value;
+        } else {
+            double result = count + value;
+            return result - ulpSigned(result);
         }
-        return result;
     }
 }
-- 
cgit 


From 3dcc0761ab6247cb20dbe16a83e19abe675a13ed Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 18 Jan 2022 21:57:53 +0100
Subject: Cleanup serialization of EM

(cherry picked from commit 44c86af58ecb24de8ba66fa6cf8fa81324a32a28)
---
 .../entity/projectiles/projectileEM.java           |   4 +-
 .../definitions/EMComplexAspectDefinition.java     |  30 +--
 .../definitions/EMPrimalAspectDefinition.java      |   4 +-
 .../transformations/AspectDefinitionCompat.java    |   2 +-
 .../AspectDefinitionCompatEnabled.java             |   4 +-
 .../thing/metaTileEntity/multi/EssentiaCompat.java |   2 +-
 .../multi/EssentiaCompatEnabled.java               |   2 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |   2 +-
 .../technus/tectech/loader/ElementalLoader.java    |   3 -
 .../elementalMatter/core/EMException.java          |  17 +-
 .../elementalMatter/core/commands/EMGive.java      |  15 +-
 .../elementalMatter/core/commands/EMList.java      |  14 +-
 .../elementalMatter/core/decay/EMDecay.java        |   2 +-
 .../core/definitions/EMComplexTemplate.java        |  73 ++++++
 .../core/definitions/EMDefinitionsRegistry.java    | 110 ++++++++
 .../core/definitions/EMPrimitiveTemplate.java      | 243 ++++++++++++++++++
 .../core/definitions/IEMDefinition.java            |  85 +++++++
 .../core/maps/EMConstantStackMap.java              |   2 +-
 .../core/maps/EMDefinitionStackMap.java            |   2 +-
 .../core/maps/EMInstanceStackMap.java              |   2 +-
 .../elementalMatter/core/maps/EMStackMap.java      |   2 +-
 .../elementalMatter/core/maps/IEMMapRead.java      |  39 ++-
 .../elementalMatter/core/maps/IEMMapWrite.java     |   2 +-
 .../core/maps/IEMMapWriteExact.java                |   2 +-
 .../core/stacks/EMDefinitionStack.java             |   6 +-
 .../core/stacks/EMInstanceStack.java               |   7 +-
 .../elementalMatter/core/stacks/IEMStack.java      |   2 +-
 .../elementalMatter/core/templates/EMComplex.java  | 135 ----------
 .../core/templates/EMPrimitive.java                | 283 ---------------------
 .../core/templates/IEMDefinition.java              |  84 ------
 .../core/transformations/EMTransformationInfo.java |  25 +-
 .../definitions/complex/EMAtomDefinition.java      |  34 +--
 .../definitions/complex/EMHadronDefinition.java    |  50 ++--
 .../definitions/complex/EMNuclideIAEA.java         |   2 +-
 .../definitions/primitive/EMBosonDefinition.java   |   4 +-
 .../definitions/primitive/EMLeptonDefinition.java  |   4 +-
 .../primitive/EMNeutrinoDefinition.java            |   4 +-
 .../primitive/EMPrimitiveDefinition.java           |  10 +-
 .../definitions/primitive/EMQuarkDefinition.java   |   4 +-
 .../github/technus/tectech/recipe/TT_recipe.java   |   6 +-
 .../technus/tectech/recipe/TT_recipeAdder.java     |   2 +-
 .../item/DebugElementalInstanceContainer_EM.java   |   7 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       |  10 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |   2 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   4 +-
 45 files changed, 692 insertions(+), 656 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java

diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index d594a826bc..785b59f093 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -52,10 +52,10 @@ public class projectileEM extends LaserProjectile {
             charge=projectileContent.getCharge();
             massFactor =(float) (projectileContent.getDefinition().getMass()/ EMHadronDefinition.hadron_n_.getMass());
 
-            if(projectileContent.getDefinition().getType()>1 || projectileContent.getDefinition().getType()<-1) {
+            if(projectileContent.getDefinition().getMatterType()>1 || projectileContent.getDefinition().getMatterType()<-1) {
                 strange = true;
             }
-            if(projectileContent.getDefinition().getType()<0) {
+            if(projectileContent.getDefinition().getMatterType()<0) {
                 antiMatter = true;
             }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index 432d151b80..e56e31f166 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -2,13 +2,14 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
@@ -25,7 +26,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class EMComplexAspectDefinition extends EMComplex {
+public final class EMComplexAspectDefinition extends EMComplexTemplate {
     private final int    hash;
     private final double mass;
 
@@ -123,19 +124,8 @@ public final class EMComplexAspectDefinition extends EMComplex {
     }
 
     @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, aspectStacks);
-    }
-
-    public static NBTTagCompound getNbtTagCompound(byte nbtType, EMConstantStackMap aspectStacks) {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        EMDefinitionStack[] quarkStacksValues = aspectStacks.valuesToArray();
-        nbt.setInteger("i", quarkStacksValues.length);
-        for (int i = 0; i < quarkStacksValues.length; i++) {
-            nbt.setTag(Integer.toString(i), quarkStacksValues[i].toNBT());
-        }
-        return nbt;
+    protected int getIndirectTagValue() {
+        return nbtType;
     }
 
     public static EMComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
@@ -169,7 +159,7 @@ public final class EMComplexAspectDefinition extends EMComplex {
     }
 
     @Override
-    public byte getType() {
+    public byte getMatterType() {
         return 0;
     }
 
@@ -250,20 +240,20 @@ public final class EMComplexAspectDefinition extends EMComplex {
 
     public static void run() {
         try {
-            EMComplex.addCreatorFromNBT(nbtType, EMComplexAspectDefinition.class.getMethod("fromNBT", NBTTagCompound.class), (byte) -96);
+            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMComplexAspectDefinition::fromNBT,EMComplexAspectDefinition.class, getClassTypeStatic());
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
         if (DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + -96);
+            TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
     @Override
     public byte getClassType() {
-        return -96;
+        return getClassTypeStatic();
     }
 
     public static byte getClassTypeStatic() {
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
index bf9703d6d7..e62c2e5278 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -8,7 +8,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by Tec on 06.05.2017.
  */
-public final class EMPrimalAspectDefinition extends EMPrimitive {
+public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     public static final EMPrimalAspectDefinition
             magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
             magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
index c7f38eb21d..a4328d2e03 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations;
 
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
index c9ca5d7b9f..ead8a5fdef 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -2,13 +2,13 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.tran
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import thaumcraft.api.aspects.Aspect;
 
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry.STACKS_REGISTERED;
 
 /**
  * Created by Tec on 21.05.2017.
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
index d51bc8dc2d..35d3a1b91f 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
index ab682ba1a5..37df2c48cc 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import net.minecraft.tileentity.TileEntity;
 import thaumcraft.api.aspects.Aspect;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 5606442c37..5fe8c973fe 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defin
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index 7ce371e57e..61989e7b13 100644
--- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -2,7 +2,6 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMNuclideIAEA;
@@ -18,8 +17,6 @@ public class ElementalLoader implements Runnable {
         // Definition init
         // ===================================================================================================
 
-        EMPrimitive.run();
-
         EMPrimitiveDefinition.run();
 
         EMQuarkDefinition.run();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
index 23ca5d77d9..e00e72446d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
@@ -3,8 +3,23 @@ package com.github.technus.tectech.mechanics.elementalMatter.core;
 /**
  * Created by danie_000 on 19.11.2016.
  */
-public final class EMException extends Exception {
+public final class EMException extends RuntimeException {
     public EMException(String message) {
         super(message);
     }
+
+    public EMException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public EMException(Throwable cause) {
+        super(cause);
+    }
+
+    public EMException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public EMException() {
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
index 64e9bcea1e..af4caf854b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -5,9 +5,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
@@ -77,11 +76,11 @@ public class EMGive implements ICommand {
         try{
             int id=Integer.parseInt(args.get(0));
             args.remove(0);
-            IEMDefinition primitive = EMPrimitive.getBindsPrimitive().get(id);
+            IEMDefinition primitive = IEMDefinition.getBindsPrimitive().get(id);
             return new EMDefinitionStack(primitive,amount);
         }catch (NumberFormatException e){
             byte clazz = (byte) args.remove(0).charAt(0);
-            Method constructor = EMComplex.getBindsComplex().get(clazz);
+            Method constructor = IEMDefinition.getBindsComplex().get(clazz);
 
             EMDefinitionStackMap stacks =new EMDefinitionStackMap();
             while(args.size()>0){
@@ -129,12 +128,12 @@ public class EMGive implements ICommand {
 
     private List<String> completionsForClassOrID(){
         ArrayList<String> strings=new ArrayList<>(8);
-        Map<Byte,Method> binds= EMComplex.getBindsComplex();
+        Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
         for (Map.Entry<Byte,Method> e:binds.entrySet()) {
             strings.add(String.valueOf((char)e.getKey().byteValue()));
         }
-        Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
-        for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+        Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
+        for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
             strings.add(String.valueOf(e.getKey().byteValue()));
         }
         return strings;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
index 395592036f..13531dbf85 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
@@ -27,15 +27,15 @@ public class EMList implements ICommand {
         if (!sender.getEntityWorld().isRemote) {
             if(args.length == 0) {
                 sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
-                Map<Byte,Method> binds= EMComplex.getBindsComplex();
+                Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
                 for (Map.Entry<Byte,Method> e:binds.entrySet()) {
                     sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
                 }
             }else if(args.length==1){
                 sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
-                if(args[0].equals(String.valueOf((char) EMPrimitive.nbtType))){
-                    Map<Integer, EMPrimitive> bindsBO = EMPrimitive.getBindsPrimitive();
-                    for (Map.Entry<Integer, EMPrimitive> e:bindsBO.entrySet()) {
+                if(args[0].equals(String.valueOf((char) EMPrimitiveTemplate.nbtType))){
+                    Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
+                    for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
                         sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getLocalizedName()));
                     }
                 }else{
@@ -65,7 +65,7 @@ public class EMList implements ICommand {
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
         if(args.length==0){
-            Map<Byte,Method> binds= EMComplex.getBindsComplex();
+            Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
             ArrayList<String> strings=new ArrayList<>(binds.size());
             for (Map.Entry<Byte,Method> e:binds.entrySet()) {
                 strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
index bed49a5040..a6bd623414 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/decay/EMDecay.java
@@ -4,7 +4,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstant
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import static com.github.technus.tectech.util.DoubleCount.mul;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
new file mode 100644
index 0000000000..94a50ce322
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
@@ -0,0 +1,73 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+/**
+ * Created by danie_000 on 23.01.2017.
+ */
+public abstract class EMComplexTemplate implements IEMDefinition {
+    /**
+     * Just empty array?
+     */
+    public static final IEMDefinition[] nothing = new EMPrimitiveTemplate[0];
+
+    @Override
+    public final EMComplexTemplate clone() {
+        return this;//IMMUTABLE
+    }
+
+    @Override
+    public int compareTo(IEMDefinition o) {
+        int classCompare = compareClassID(o);
+        if (classCompare != 0) {
+            return classCompare;
+        }
+        //that allows neat check if the same thing and
+        //top hierarchy amount can be used to store amount info
+        return getSubParticles().compareWithAmountsInternal(o.getSubParticles());
+    }
+
+    @Override
+    public final EMDefinitionStack getStackForm(double amount) {
+        return new EMDefinitionStack(this, amount);
+    }
+
+    @Override
+    public final boolean equals(Object obj) {
+        if(this==obj) {
+            return true;
+        }
+        if (obj instanceof IEMDefinition) {
+            return compareTo((IEMDefinition) obj) == 0;
+        }
+        if (obj instanceof IEMStack) {
+            return compareTo(((IEMStack) obj).getDefinition()) == 0;
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {//Internal amounts should be also hashed
+        int hash = -(getSubParticles().size() << 4);
+        for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
+            int amount=(int) stack.getAmount();
+            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
+        }
+        return hash;
+    }
+
+    @Override
+    public String toString() {
+        return getLocalizedName()+ '\n' + getSymbol();
+    }
+
+    public NBTTagCompound toNBT() {
+        NBTTagCompound nbtTagCompound = getSubParticles().toNBT();
+        nbtTagCompound.setInteger(EMDefinitionsRegistry.getIndirectTagName(), getIndirectTagValue());
+        return nbtTagCompound;
+    }
+
+    protected abstract int getIndirectTagValue();
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
new file mode 100644
index 0000000000..c0f9df32f2
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
@@ -0,0 +1,110 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+import java.util.function.Function;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+
+public class EMDefinitionsRegistry {
+    private static final NavigableSet<IEMDefinition>                                     STACKS_REGISTERED = new TreeSet<>();
+    private static final Map<Integer, IEMDefinition>                                     DIRECT_BINDS      = new HashMap<>();
+    private static final Map<Integer, Function<NBTTagCompound, ? extends IEMDefinition>> CLASS_BINDS       = new HashMap<>();//creator methods in subclasses
+    private static final Map<Integer, Class<? extends IEMDefinition>>                    CLASSES           = new HashMap<>();
+    private static final Map<Class<? extends IEMDefinition>, Integer>                    CLASS_TYPES       = new HashMap<>();
+    private static final String                                                          INDIRECT_TAG      = "t";
+    private static final String                                                          DIRECT_TAG        = "c";
+
+    private EMDefinitionsRegistry() {
+    }
+
+    static {
+        CLASS_BINDS.put(0, EMDefinitionsRegistry::getDefinitionDirect);
+        CLASS_BINDS.put((int) 'p', EMDefinitionsRegistry::getDefinitionDirect);
+    }
+
+    private static IEMDefinition getDefinitionDirect(NBTTagCompound nbt) {
+        return DIRECT_BINDS.get(nbt.getInteger(getDirectTagName()));
+    }
+
+    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
+        IEMDefinition apply;
+        try {
+            apply = CLASS_BINDS.get(nbt.getInteger(getIndirectTagName())).apply(nbt);
+        } catch (Exception e) {
+            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
+            if (DEBUG_MODE) {
+                emException.printStackTrace();
+                return nbtE__;
+            } else {
+                throw emException;
+            }
+        }
+        if (!DEBUG_MODE) {
+            if (apply == nbtE__) {
+                throw new EMException("Deserialized to NBT ERROR!");
+            } else if (apply == null__ || apply == null) {
+                throw new EMException("Deserialized to NULL POINTER!");
+            }
+        }
+        if (apply == null) {
+            return null__;
+        }
+        return apply;
+    }
+
+    public static <T extends IEMDefinition> void registerDefinitionClass(int shortcutNBT, Function<NBTTagCompound, T> creator, Class<T> clazz, int classID) {
+        if (CLASS_BINDS.put(shortcutNBT, creator) != null) {
+            EMException e = new EMException("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+        if (CLASSES.put(classID, clazz) != null) {
+            EMException e = new EMException("Duplicate Class ID! " + classID + " used for class comparison");
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+        CLASS_TYPES.put(clazz, classID);
+    }
+
+    public static void registerDirectDefinition(IEMDefinition definition, int id) {
+        IEMDefinition old = DIRECT_BINDS.put(id, definition);
+        if (old != null) {
+            EMException e = new EMException("Duplicate primitive EM ID: " + id +
+                    " for " + definition.getLocalizedName() +
+                    " and " + old.getLocalizedName());
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    public static NavigableSet<IEMDefinition> getStacksRegisteredForDisplay() {
+        return STACKS_REGISTERED;
+    }
+
+    public static void registerForDisplay(IEMDefinition definition){
+        STACKS_REGISTERED.add(definition);
+        STACKS_REGISTERED.add(definition.getAnti());
+    }
+
+    public static String getIndirectTagName() {
+        return INDIRECT_TAG;
+    }
+
+    public static String getDirectTagName() {
+        return DIRECT_TAG;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
new file mode 100644
index 0000000000..f3ce34dd1d
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -0,0 +1,243 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
+import static com.github.technus.tectech.util.Util.areBitsSet;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!
+ */
+public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
+    private final String name;
+    private final String symbol;
+    //float-mass in eV/c^2
+    private final double mass;
+    //int -electric charge in 1/3rds of electron charge for optimization
+    private final int    charge;
+    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
+    private final byte   color;
+    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
+    private final byte type;
+
+    private EMPrimitiveTemplate anti;//IMMUTABLE
+    private EMDecay[]           elementalDecays;
+    private byte                naturalDecayInstant;
+    private byte energeticDecayInstant;
+    private double rawLifeTime;
+
+    private final int ID;
+
+    //no _ at end - normal particle
+    //   _ at end - anti particle
+    //  __ at end - self is antiparticle
+
+    protected EMPrimitiveTemplate(String name, String symbol, int type, double mass, int charge, int color, int ID) {
+        this.name = name;
+        this.symbol = symbol;
+        this.type = (byte) type;
+        this.mass = mass;
+        this.charge = charge;
+        this.color = (byte) color;
+        this.ID = ID;
+        EMDefinitionsRegistry.registerDirectDefinition(this,ID);
+    }
+
+    //
+    protected void init(EMPrimitiveTemplate antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
+        anti = antiParticle;
+        this.rawLifeTime = rawLifeTime;
+        naturalDecayInstant = (byte) naturalInstant;
+        energeticDecayInstant = (byte) energeticInstant;
+        elementalDecays =elementalDecaysArray;
+        EMDefinitionsRegistry.registerForDisplay(this);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return "Undefined: " + getName();
+    }
+
+    @Override
+    public String getSymbol() {
+        return symbol;
+    }
+
+    @Override
+    public String getShortSymbol() {
+        return getSymbol();
+    }
+
+    @Override
+    public IEMDefinition getAnti() {
+        return anti;//no need for copy
+    }
+
+    @Override
+    public int getCharge() {
+        return charge;
+    }
+
+    @Override
+    public byte getColor() {
+        return color;
+    }
+
+    @Override
+    public double getMass() {
+        return mass;
+    }
+
+    @Override
+    public EMDecay[] getNaturalDecayInstant() {
+        if (naturalDecayInstant < 0) {
+            return elementalDecays;
+        }else if (naturalDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[naturalDecayInstant]};
+    }
+
+    @Override
+    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
+        if (energeticDecayInstant < 0) {
+            return elementalDecays;
+        }else if (energeticDecayInstant>=elementalDecays.length){
+            return EMDecay.NO_PRODUCT;
+        }
+        return new EMDecay[]{elementalDecays[energeticDecayInstant]};
+    }
+
+    @Override
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+    }
+
+    @Override
+    public boolean usesSpecialEnergeticDecayHandling() {
+        return false;
+    }
+
+    @Override
+    public boolean usesMultipleDecayCalls(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean decayMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public boolean fusionMakesEnergy(long energyLevel) {
+        return false;
+    }
+
+    @Override
+    public EMDecay[] getDecayArray() {
+        return elementalDecays;
+    }
+
+    @Override
+    public double getRawTimeSpan(long currentEnergy) {
+        return rawLifeTime;
+    }
+
+    @Override
+    public final EMConstantStackMap getSubParticles() {
+        return null;
+    }
+
+    @Override
+    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
+        return null;
+    }
+
+    @Override
+    public EMItemDequantizationInfo someAmountIntoItemsStack() {
+        return null;
+    }
+
+    @Override
+    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
+        return null;
+    }
+
+    @Override
+    public byte getMatterType() {
+        return type;
+    }
+
+    @Override
+    public final NBTTagCompound toNBT() {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setInteger(EMDefinitionsRegistry.getDirectTagName(), ID);
+        return nbt;
+    }
+
+    @Override
+    public final byte getClassType() {
+        return getClassTypeStatic();
+    }
+
+    public static byte getClassTypeStatic(){
+        return -128;
+    }
+
+    @Override
+    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add(getShortSymbol());
+        }
+    }
+
+    @Override
+    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
+        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + EMDefinitionsRegistry.getDirectTagName() + ' ' + getClassType());
+        }
+        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = "+ getLocalizedName());
+            lines.add("SYMBOL = "+getSymbol());
+        }
+        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+            lines.add("CHARGE = " + getCharge() / 3D + " e");
+        }
+        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
+            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        }
+        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
+            lines.add("MASS = " + getMass() + " eV/c\u00b2");
+        }
+        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
+            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
+            lines.add("    "+"At current energy level");
+        }
+    }
+
+    @Override
+    public final int compareTo(IEMDefinition o) {
+        if (getClassType() == o.getClassType()) {
+            int oID = ((EMPrimitiveTemplate) o).ID;
+            return Integer.compare(ID, oID);
+        }
+        return compareClassID(o);
+    }
+
+    @Override
+    public final int hashCode() {
+        return ID;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
new file mode 100644
index 0000000000..06bfc61737
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
@@ -0,0 +1,85 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.ArrayList;
+
+/**
+ * Created by danie_000 on 11.11.2016.
+ */
+public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IMMUTABLE
+    double            STABLE_RAW_LIFE_TIME       =1.5e36D;
+    double            NO_DECAY_RAW_LIFE_TIME     =-1D;
+    long              DEFAULT_ENERGY_LEVEL       =0;
+    double            DEFAULT_ENERGY_REQUIREMENT =25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
+    //add text based creators for recipe formula input?
+
+    //Nomenclature
+    String getLocalizedName();
+
+    String getSymbol();
+
+    String getShortSymbol();
+
+    void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
+
+    byte getMatterType();
+
+    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
+
+    //Not dynamically changing stuff
+    IEMDefinition getAnti();//gives new anti particle def
+
+    EMDecay[] getDecayArray();//possible decays
+
+    EMDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
+
+    EMDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
+
+    boolean usesSpecialEnergeticDecayHandling();
+
+    boolean usesMultipleDecayCalls(long energyLevel);
+
+    boolean decayMakesEnergy(long energyLevel);
+
+    boolean fusionMakesEnergy(long energyLevel);
+
+    double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
+
+    double getMass();//mass... MeV/c^2
+
+    int getCharge();//charge 1/3 electron charge
+
+    //dynamically changing stuff
+    byte getColor();//-1 nope cannot 0 it can but undefined
+
+    double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
+
+    boolean isTimeSpanHalfLife();
+
+    EMConstantStackMap getSubParticles();//contents... null if none
+
+    EMFluidDequantizationInfo someAmountIntoFluidStack();
+
+    EMItemDequantizationInfo someAmountIntoItemsStack();
+
+    EMOredictDequantizationInfo someAmountIntoOredictStack();
+
+    NBTTagCompound toNBT();
+
+    EMDefinitionStack getStackForm(double amount);
+
+    IEMDefinition clone();
+
+    default int compareClassID(IEMDefinition obj) {
+        return (int) getClassType() - obj.getClassType();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
index d9297436a0..e6cfa7d03e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.Collections;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
index 45ce50d5c7..78bb8d740a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.NavigableMap;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
index c15142787f..69dc53f83d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -4,7 +4,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayRe
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
index 4c798499b5..795ac3d3bf 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import java.util.NavigableMap;
 import java.util.TreeMap;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
index 392d06f5cf..1322566914 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
@@ -136,8 +136,8 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setInteger("i", size());
         int i = 0;
-        for (T stack : values()) {
-            nbt.setTag(Integer.toString(i++), stack.toNBT());
+        for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
+            nbt.setTag(Integer.toString(i++), entry.getValue().toNBT());
         }
         return nbt;
     }
@@ -161,6 +161,39 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         return 0;
     }
 
+    /**
+     * use only for nested operations!
+     * @param o
+     * @return
+     */
+    default int compareWithAmountsInternal(IEMMapRead<? extends IEMStack> o) {
+        if (o == null) {
+            return 1;
+        }
+
+        int lenDiff = size() - o.size();
+        if (lenDiff != 0) {
+            return lenDiff;
+        }
+
+        Iterator<Map.Entry<IEMDefinition, T>>                            iterator  = entrySet().iterator();
+        Iterator<? extends Map.Entry<IEMDefinition, ? extends IEMStack>> iteratorO = o.entrySet().iterator();
+
+        while (iterator.hasNext()) {
+            T        first  = iterator.next().getValue();
+            IEMStack second = iteratorO.next().getValue();
+            int      result = first.compareTo(second);
+            if (result != 0) {
+                return result;
+            }
+            result=Double.compare(first.getAmount(),second.getAmount());
+            if (result != 0) {
+                return result;
+            }
+        }
+        return 0;
+    }
+
     default double getMass(){
         double mass=0;
         for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
index cc22267474..f13e82fb26 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
 
 import java.util.Map;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
index 7b8853a2f4..167ec8451d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
index fe0c73e795..f868dbe0ad 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
@@ -50,7 +50,7 @@ public final class EMDefinitionStack implements IEMStack {
 
     public static EMDefinitionStack fromNBT(NBTTagCompound nbt) {
         return new EMDefinitionStack(
-                EMComplex.fromNBT(nbt.getCompoundTag("d")),
+                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
                 nbt.getLong("q")+nbt.getDouble("Q"));
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
index b73bd21f02..6347cd2144 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.util.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
@@ -558,9 +558,8 @@ public final class EMInstanceStack implements IEMStack {
     }
 
     public static EMInstanceStack fromNBT(NBTTagCompound nbt) {
-        NBTTagCompound definition = nbt.getCompoundTag("d");
         EMInstanceStack instance = new EMInstanceStack(
-                EMComplex.fromNBT(definition),
+                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
                 nbt.getLong("q") + nbt.getDouble("Q"),
                 nbt.getFloat("m") + nbt.getDouble("M"),
                 nbt.getLong("a") + nbt.getDouble("A"),
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
index 94c76634d9..5672b31c04 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
deleted file mode 100644
index 7fc074bded..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMComplex.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
-
-/**
- * Created by danie_000 on 23.01.2017.
- */
-public abstract class EMComplex implements IEMDefinition {
-    //Nothing array
-    public static final IEMDefinition[] nothing = new EMPrimitive[0];
-
-    //add text based creators for recipe formula input?
-    private static final Map<Byte, Method> nbtCreationBind = new HashMap<>();//creator methods in subclasses
-    private static final HashSet<Byte> classSet = new HashSet<>();
-
-    protected static void addCreatorFromNBT(byte shortcutNBT, Method constructorFromNBT,byte classID) {
-        if(nbtCreationBind.put(shortcutNBT, constructorFromNBT)!=null) {
-            throw new Error("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
-        }
-        if(!classSet.add(classID)) {
-            throw new Error("Duplicate Class ID! " + classID + " used for class comparison");
-        }
-    }
-
-    public static Map<Byte, Method> getBindsComplex(){
-        return nbtCreationBind;
-    }
-
-    @Override
-    public final EMComplex clone() {
-        return this;//IMMUTABLE
-    }
-
-    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
-        try {
-            return (IEMDefinition) nbtCreationBind.get(nbt.getByte("t")).invoke(null, nbt);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return nbtE__;
-        }
-    }
-
-    @Override
-    public int compareTo(IEMDefinition o) {
-        int classCompare = compareClassID(o);
-        if (classCompare != 0) {
-            return classCompare;
-        }
-
-        //only of the internal def stacks!!!
-        //that allows neat check if the same thing and
-        //top hierarchy amount can be used to store amount info
-        return compareInnerContentsWithAmounts(getSubParticles().valuesToArray(), o.getSubParticles().valuesToArray());
-    }
-
-    //use only for nested operations!
-    private static int compareInnerContentsWithAmounts(EMDefinitionStack[] tc, EMDefinitionStack[] sc) {
-        if (tc == null) {
-            if (sc == null) {
-                return 0;
-            } else {
-                return -1;
-            }
-        }
-        if (sc == null) {
-            return 1;
-        }
-
-        int lenDiff = tc.length - sc.length;
-        if (lenDiff != 0) {
-            return lenDiff;
-        }
-
-        for (int i = 0; i < tc.length; i++) {
-            int cn = tc[i].getDefinition().compareTo(sc[i].getDefinition());
-            if (cn != 0) {
-                return cn;
-            }
-
-            if (tc[i].getAmount() > sc[i].getAmount()) {
-                return 1;
-            }
-            if (tc[i].getAmount() < sc[i].getAmount()) {
-                return -1;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public final EMDefinitionStack getStackForm(double amount) {
-        return new EMDefinitionStack(this, amount);
-    }
-
-    @Override
-    public final boolean equals(Object obj) {
-        if(this==obj) {
-            return true;
-        }
-        if (obj instanceof IEMDefinition) {
-            return compareTo((IEMDefinition) obj) == 0;
-        }
-        if (obj instanceof IEMStack) {
-            return compareTo(((IEMStack) obj).getDefinition()) == 0;
-        }
-        return false;
-    }
-
-    @Override
-    public int hashCode() {//Internal amounts should be also hashed
-        int hash = -(getSubParticles().size() << 4);
-        for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
-            int amount=(int) stack.getAmount();
-            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
-        }
-        return hash;
-    }
-
-    @Override
-    public String toString() {
-        return getLocalizedName()+ '\n' + getSymbol();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
deleted file mode 100644
index 587affd0f1..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/EMPrimitive.java
+++ /dev/null
@@ -1,283 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import net.minecraft.client.Minecraft;
-import net.minecraft.crash.CrashReport;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-
-import static com.github.technus.tectech.util.Util.areBitsSet;
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-
-/**
- * Created by danie_000 on 22.10.2016.
- * EXTEND THIS TO ADD NEW PRIMITIVES, WATCH OUT FOR ID'S!!!  (-1 to 32 can be assumed as used)
- */
-public abstract class EMPrimitive extends EMComplex {
-    public static final byte nbtType = (byte) 'p';
-
-    private static final Map<Integer, EMPrimitive> bindsBO = new HashMap<>();
-
-    public static Map<Integer, EMPrimitive> getBindsPrimitive() {
-        return bindsBO;
-    }
-
-    private final String name;
-    private final String symbol;
-    //float-mass in eV/c^2
-    private final double mass;
-    //int -electric charge in 1/3rds of electron charge for optimization
-    private final int    charge;
-    //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private final byte   color;
-    //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
-    private final byte type;
-
-    private EMPrimitive anti;//IMMUTABLE
-    private EMDecay[]   elementalDecays;
-    private byte                naturalDecayInstant;
-    private byte energeticDecayInstant;
-    private double rawLifeTime;
-
-    private final int ID;
-
-    //no _ at end - normal particle
-    //   _ at end - anti particle
-    //  __ at end - self is antiparticle
-
-    protected EMPrimitive(String name, String symbol, int type, double mass, int charge, int color, int ID) {
-        this.name = name;
-        this.symbol = symbol;
-        this.type = (byte) type;
-        this.mass = mass;
-        this.charge = charge;
-        this.color = (byte) color;
-        this.ID = ID;
-        if (bindsBO.put(ID, this) != null) {
-            Minecraft.getMinecraft().crashed(new CrashReport("Primitive definition", new EMException("Duplicate ID")));
-        }
-        STACKS_REGISTERED.add(this);
-    }
-
-    //
-    protected void init(EMPrimitive antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
-        anti = antiParticle;
-        this.rawLifeTime = rawLifeTime;
-        naturalDecayInstant = (byte) naturalInstant;
-        energeticDecayInstant = (byte) energeticInstant;
-        elementalDecays =elementalDecaysArray;
-    }
-
-    @Override
-    public String getLocalizedName() {
-        return "Undefined: " + getName();
-    }
-
-    @Override
-    public String getSymbol() {
-        return symbol;
-    }
-
-    @Override
-    public String getShortSymbol() {
-        return getSymbol();
-    }
-
-    @Override
-    public IEMDefinition getAnti() {
-        return anti;//no need for copy
-    }
-
-    @Override
-    public int getCharge() {
-        return charge;
-    }
-
-    @Override
-    public byte getColor() {
-        return color;
-    }
-
-    @Override
-    public double getMass() {
-        return mass;
-    }
-
-    @Override
-    public EMDecay[] getNaturalDecayInstant() {
-        if (naturalDecayInstant < 0) {
-            return elementalDecays;
-        }else if (naturalDecayInstant>=elementalDecays.length){
-            return EMDecay.NO_PRODUCT;
-        }
-        return new EMDecay[]{elementalDecays[naturalDecayInstant]};
-    }
-
-    @Override
-    public EMDecay[] getEnergyInducedDecay(long energyLevel) {
-        if (energeticDecayInstant < 0) {
-            return elementalDecays;
-        }else if (energeticDecayInstant>=elementalDecays.length){
-            return EMDecay.NO_PRODUCT;
-        }
-        return new EMDecay[]{elementalDecays[energeticDecayInstant]};
-    }
-
-    @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
-    }
-
-    @Override
-    public boolean usesSpecialEnergeticDecayHandling() {
-        return false;
-    }
-
-    @Override
-    public boolean usesMultipleDecayCalls(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean decayMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public boolean fusionMakesEnergy(long energyLevel) {
-        return false;
-    }
-
-    @Override
-    public EMDecay[] getDecayArray() {
-        return elementalDecays;
-    }
-
-    @Override
-    public double getRawTimeSpan(long currentEnergy) {
-        return rawLifeTime;
-    }
-
-    @Override
-    public final EMConstantStackMap getSubParticles() {
-        return null;
-    }
-
-    @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public byte getType() {
-        return type;
-    }
-
-    @Override
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setByte("t", nbtType);
-        nbt.setInteger("c", getID());
-        return nbt;
-    }
-
-    public static EMPrimitive fromNBT(NBTTagCompound content) {
-        EMPrimitive primitive = bindsBO.get(content.getInteger("c"));
-        return primitive == null ? null__ : primitive;
-    }
-
-    @Override
-    public final byte getClassType() {
-        return -128;
-    }
-
-    public static byte getClassTypeStatic(){
-        return -128;
-    }
-
-    @Override
-    public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add(getShortSymbol());
-        }
-    }
-
-    @Override
-    public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
-        }
-        if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+ getLocalizedName());
-            lines.add("SYMBOL = "+getSymbol());
-        }
-        if(areBitsSet(SCAN_GET_CHARGE,capabilities)) {
-            lines.add("CHARGE = " + getCharge() / 3D + " e");
-        }
-        if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
-        }
-        if(areBitsSet(SCAN_GET_MASS,capabilities)) {
-            lines.add("MASS = " + getMass() + " eV/c\u00b2");
-        }
-        if(areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add((isTimeSpanHalfLife()?"HALF LIFE = ":"LIFE TIME = ")+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
-        }
-    }
-
-    public static void run() {
-        try {
-            EMComplex.addCreatorFromNBT(nbtType, EMPrimitive.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-128);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Primitive " + nbtType + ' ' + -128);
-        }
-    }
-
-    @Override
-    public final int compareTo(IEMDefinition o) {
-        if (getClassType() == o.getClassType()) {
-            int oID = ((EMPrimitive) o).getID();
-            return Integer.compare(getID(), oID);
-        }
-        return compareClassID(o);
-    }
-
-    @Override
-    public final int hashCode() {
-        return getID();
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getID() {
-        return ID;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
deleted file mode 100644
index 7ae6d0395c..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/templates/IEMDefinition.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.templates;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.ArrayList;
-
-/**
- * Created by danie_000 on 11.11.2016.
- */
-public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IMMUTABLE
-    double STABLE_RAW_LIFE_TIME =1.5e36D;
-    double NO_DECAY_RAW_LIFE_TIME=-1D;
-    long DEFAULT_ENERGY_LEVEL=0;
-    double DEFAULT_ENERGY_REQUIREMENT=25000D;//legit cuz normal atoms should only emit a gamma if they don't have defined energy levels
-
-    //Nomenclature
-    String getLocalizedName();
-
-    String getSymbol();
-
-    String getShortSymbol();
-
-    void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
-
-    byte getType();
-
-    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
-
-    //Not dynamically changing stuff
-    IEMDefinition getAnti();//gives new anti particle def
-
-    EMDecay[] getDecayArray();//possible decays
-
-    EMDecay[] getNaturalDecayInstant();//natural decay if lifespan <1tick
-
-    EMDecay[] getEnergyInducedDecay(long energyLevel);//energetic decay
-
-    boolean usesSpecialEnergeticDecayHandling();
-
-    boolean usesMultipleDecayCalls(long energyLevel);
-
-    boolean decayMakesEnergy(long energyLevel);
-
-    boolean fusionMakesEnergy(long energyLevel);
-
-    double getEnergyDiffBetweenStates(long currentEnergy, long newEnergyLevel);//positive or negative
-
-    double getMass();//mass... MeV/c^2
-
-    int getCharge();//charge 1/3 electron charge
-
-    //dynamically changing stuff
-    byte getColor();//-1 nope cannot 0 it can but undefined
-
-    double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
-
-    boolean isTimeSpanHalfLife();
-
-    EMConstantStackMap getSubParticles();//contents... null if none
-
-    EMFluidDequantizationInfo someAmountIntoFluidStack();
-
-    EMItemDequantizationInfo someAmountIntoItemsStack();
-
-    EMOredictDequantizationInfo someAmountIntoOredictStack();
-
-    NBTTagCompound toNBT();
-
-    EMDefinitionStack getStackForm(double amount);
-
-    IEMDefinition clone();
-
-    default int compareClassID(IEMDefinition obj) {
-        return (int) getClassType() - obj.getClassType();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
index fca79b0b6f..d6f6731aec 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
@@ -1,7 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraft.item.ItemStack;
@@ -12,7 +13,6 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM.STACKS_REGISTERED;
 import static java.lang.Math.pow;
 
 /**
@@ -72,15 +72,13 @@ public class EMTransformationInfo {
     public void addFluid(IEMStack em, FluidStack fluidStack){
         getFluidQuantization().put(fluidStack.getFluidID(),new EMFluidQuantizationInfo(fluidStack,em));
         getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluidStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addFluid(IEMStack em, Fluid fluid, int fluidAmount){
         getFluidQuantization().put(fluid.getID(),new EMFluidQuantizationInfo(fluid,fluidAmount,em));
         getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluid,fluidAmount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     private void addItemQuantization(EMItemQuantizationInfo aIQI){
@@ -90,36 +88,31 @@ public class EMTransformationInfo {
     public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT){
         addItemQuantization(new EMItemQuantizationInfo(itemStack,skipNBT,em));
         getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,itemStack));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
         addItemQuantization(new EMItemQuantizationInfo(prefix,material,amount,skipNBT,em));
         getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,prefix,material,amount));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addOredict(IEMStack em, String name, int qty){
         getOredictQuantization().put(OreDictionary.getOreID(name),new EMOredictQuantizationInfo(name,qty,em));
         getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,name,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty){
         getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + material.mName),new EMOredictQuantizationInfo(prefix,material,qty,em));
         getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,material,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty){
         getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + materialName),new EMOredictQuantizationInfo(prefix,materialName,qty,em));
         getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,materialName,qty));
-        STACKS_REGISTERED.add(em.getDefinition());
-        STACKS_REGISTERED.add(em.getDefinition().getAnti());
+        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
     }
 
     public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 77ac6c46c4..666249f408 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -3,13 +3,14 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
@@ -25,7 +26,6 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.*;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
@@ -37,7 +37,7 @@ import static gregtech.api.enums.OrePrefixes.dust;
 /**
  * Created by danie_000 on 18.11.2016.
  */
-public final class EMAtomDefinition extends EMComplex {
+public final class EMAtomDefinition extends EMComplexTemplate {
     public static final long ATOM_COMPLEXITY_LIMIT=65536L;
     private static final byte BYTE_OFFSET=32;
 
@@ -118,10 +118,10 @@ public final class EMAtomDefinition extends EMComplex {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             mass += stack.getMass();
-            if (def.getType() < 0) {
+            if (def.getMatterType() < 0) {
                 containsAnti = true;
             }
-            type = Math.max(type, Math.abs(def.getType()));
+            type = Math.max(type, Math.abs(def.getMatterType()));
 
             if (def instanceof EMLeptonDefinition) {
                 cLeptons += stack.getCharge();
@@ -307,7 +307,7 @@ public final class EMAtomDefinition extends EMComplex {
     }
 
     @Override
-    public byte getType() {
+    public byte getMatterType() {
         return type;
     }
 
@@ -340,7 +340,7 @@ public final class EMAtomDefinition extends EMComplex {
         int element = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
-            if (Math.abs(getType()) != 1) {
+            if (Math.abs(getMatterType()) != 1) {
                 return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
             }
             return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
@@ -408,7 +408,7 @@ public final class EMAtomDefinition extends EMComplex {
     }
 
     private EMDecay[] getDecayArray(ArrayList<EMDecay> decaysList, int decayMode, boolean tryAnti) {//todo?
-        if (getType() == 1) {
+        if (getMatterType() == 1) {
             switch (decayMode) {
                 case -2:
                     if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
@@ -446,7 +446,7 @@ public final class EMAtomDefinition extends EMComplex {
                     }
             }
             return EMDecay.NO_DECAY;
-        }else if(getType() ==-1){
+        }else if(getMatterType() ==-1){
             EMAtomDefinition anti =getAnti();
             if(anti!=null) {
                 return anti.getDecayArray(decaysList, decayMode, false);
@@ -1264,7 +1264,7 @@ public final class EMAtomDefinition extends EMComplex {
         //disembody
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
-            if (elementalStack.getDefinition().getType() == 1 || elementalStack.getDefinition().getType() == -1) {
+            if (elementalStack.getDefinition().getMatterType() == 1 || elementalStack.getDefinition().getMatterType() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(elementalStack);
             } else {
@@ -1344,8 +1344,8 @@ public final class EMAtomDefinition extends EMComplex {
     }
 
     @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, elementalStacks);
+    protected int getIndirectTagValue() {
+        return nbtType;
     }
 
     public static EMAtomDefinition fromNBT(NBTTagCompound nbt) {
@@ -1465,14 +1465,14 @@ public final class EMAtomDefinition extends EMComplex {
         }
 
         try {
-            EMComplex.addCreatorFromNBT(nbtType, EMAtomDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)64);
+            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMAtomDefinition::fromNBT,EMAtomDefinition.class,getClassTypeStatic());
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
         if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + 64);
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
@@ -1644,7 +1644,7 @@ public final class EMAtomDefinition extends EMComplex {
 
     @Override
     public byte getClassType() {
-        return 64;
+        return getClassTypeStatic();
     }
 
     public static byte getClassTypeStatic(){
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index 384087770f..a901f5c8fc 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -1,17 +1,20 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.*;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
-import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import com.github.technus.tectech.util.Util;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
@@ -22,7 +25,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition.getNbtTagCompound;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
@@ -33,7 +35,7 @@ import static gregtech.api.enums.OrePrefixes.dust;
 /**
  * Created by danie_000 on 17.11.2016.
  */
-public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
+public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i/o
     private final int hash;
 
     private static final byte                           nbtType    = (byte) 'h';
@@ -90,8 +92,8 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
             }
             mass += quarkStack.getMass();
             charge += quarkStack.getCharge();
-            type = Math.max(Math.abs(quarkStack.getDefinition().getType()), type);
-            if (quarkStack.getDefinition().getType() < 0) {
+            type = Math.max(Math.abs(quarkStack.getDefinition().getMatterType()), type);
+            if (quarkStack.getDefinition().getMatterType() < 0) {
                 containsAnti = true;
             }
         }
@@ -212,12 +214,12 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     @Override
     public EMDecay[] getNaturalDecayInstant() {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
             return EMDecay.NO_PRODUCT;
         }
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack quarks : quarkStacks) {
-            if (quarks.getDefinition().getType() == 1 || quarks.getDefinition().getType() == -1) {
+            if (quarks.getDefinition().getMatterType() == 1 || quarks.getDefinition().getMatterType() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(quarks);
             } else {
@@ -234,7 +236,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
             return EMDecay.NO_PRODUCT;
         }
         return new EMDecay[]{new EMDecay(0.75D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
@@ -270,7 +272,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (getAmount() == 2 && quarkStacks.length == 2 &&
                 quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() &&
-                quarkStacks[0].getDefinition().getType() == -quarkStacks[1].getDefinition().getType()) {
+                quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
             return EMDecay.NO_PRODUCT;
         } else if (getAmount() != 3) {
             return new EMDecay[]{new EMDecay(0.95D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
@@ -286,7 +288,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
             EMQuarkDefinition lastQuark = newBaryon.remove(2);
 
             EMDefinitionStack[] decay;
-            if (Math.abs(lastQuark.getType()) > 1) {
+            if (Math.abs(lastQuark.getMatterType()) > 1) {
                 decay = lastQuark.getDecayArray()[1].getOutputStacks().valuesToArray();
             } else {
                 decay = lastQuark.getDecayArray()[2].getOutputStacks().valuesToArray();
@@ -334,7 +336,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     }
 
     @Override
-    public byte getType() {
+    public byte getMatterType() {
         return type;
     }
 
@@ -385,8 +387,8 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
     }
 
     @Override
-    public NBTTagCompound toNBT() {
-        return getNbtTagCompound(nbtType, quarkStacks);
+    protected int getIndirectTagValue() {
+        return nbtType;
     }
 
     public static EMHadronDefinition fromNBT(NBTTagCompound nbt) {
@@ -412,22 +414,22 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
             SYMBOL_MAP.put(hadron_p,"p");
             NAME_MAP.put(hadron_p,"Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p);
             hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
             SYMBOL_MAP.put(hadron_p_,"~p");
             NAME_MAP.put(hadron_p_,"Anti Proton");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_p_);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p_);
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.getMass();
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
             NAME_MAP.put(hadron_n, "Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n);
             hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
             SYMBOL_MAP.put(hadron_n_,"~n");
             NAME_MAP.put(hadron_n_,"Anti Neutron");
-            DebugElementalInstanceContainer_EM.STACKS_REGISTERED.add(hadron_n_);
+            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n_);
         } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -444,14 +446,14 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
         hadron_p5 = new EMDefinitionStack(hadron_p, 5D);
 
         try {
-            EMComplex.addCreatorFromNBT(nbtType, EMHadronDefinition.class.getMethod("fromNBT", NBTTagCompound.class),(byte)-64);
+            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMHadronDefinition::fromNBT,EMHadronDefinition.class,getClassTypeStatic());
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
         if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + -64);
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
@@ -467,7 +469,7 @@ public final class EMHadronDefinition extends EMComplex {//TODO Optimize map i/o
 
     @Override
     public byte getClassType() {
-        return -64;
+        return getClassTypeStatic();
     }
 
     public static byte getClassTypeStatic(){
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
index 9a22f54941..bd34733cb6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
@@ -7,7 +7,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.TreeMap;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.util.Util.splitButDifferent;
 
 public final class EMNuclideIAEA {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index e3efa3b7e6..5f14eefcdb 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
@@ -11,7 +11,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMBosonDefinition extends EMPrimitive {
+public final class EMBosonDefinition extends EMPrimitiveTemplate {
     public static final EMBosonDefinition
             boson_Y__ = new EMBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
             boson_H__ = new EMBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index 98bdf7ca5c..0f9898775f 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
@@ -11,7 +11,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMLeptonDefinition extends EMPrimitive {
+public final class EMLeptonDefinition extends EMPrimitiveTemplate {
     public static final EMLeptonDefinition
             lepton_e = new EMLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
             lepton_m = new EMLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index e77c74ed89..ac06a80728 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -2,14 +2,14 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMNeutrinoDefinition extends EMPrimitive {
+public final class EMNeutrinoDefinition extends EMPrimitiveTemplate {
     public static final EMNeutrinoDefinition
             lepton_Ve = new EMNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
             lepton_Vm = new EMNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index 68591cc4e6..e4a92fbae1 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -1,17 +1,17 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMPrimitiveDefinition extends EMPrimitive {
+public final class EMPrimitiveDefinition extends EMPrimitiveTemplate {
     public static final EMPrimitiveDefinition
-            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, Integer.MIN_VALUE+10_000),
-            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MAX_VALUE-10_000),
-            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, 0),
+            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, 0),
+            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MIN_VALUE),
+            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, Integer.MIN_VALUE+1),
             magic = new EMPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
             magic_ = new EMPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index b0a5c419e1..9afa04d243 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
@@ -9,7 +9,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMQuarkDefinition extends EMPrimitive {
+public final class EMQuarkDefinition extends EMPrimitiveTemplate {
     public static final EMQuarkDefinition
             quark_u = new EMQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
             quark_c = new EMQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index f5cfad22f3..b7310485a2 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,11 +1,11 @@
 package com.github.technus.tectech.recipe;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMComplex;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.item.ItemStack;
@@ -262,7 +262,7 @@ public class TT_recipe extends GT_Recipe {
                 return null;
             }
             try {
-                return mRecipeMap.get(EMComplex.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
+                return mRecipeMap.get(EMDefinitionsRegistry.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
             }catch (Exception e){
                 if (DEBUG_MODE) {
                     e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index c72bf0ab9e..97cd4a6ea6 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.recipe;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index 107cb97103..2062173cfd 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.thing.item;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
@@ -7,7 +8,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance
 import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -26,7 +27,6 @@ import net.minecraft.world.World;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.TreeSet;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
@@ -39,7 +39,6 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  * Created by Tec on 15.03.2017.
  */
 public final class DebugElementalInstanceContainer_EM extends Item implements IElementalItem {
-    public static final TreeSet<IEMDefinition> STACKS_REGISTERED =new TreeSet<>();
 
     public static DebugElementalInstanceContainer_EM INSTANCE;
 
@@ -141,7 +140,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         ItemStack that = new ItemStack(this, 1);
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
-        for(IEMDefinition definition: STACKS_REGISTERED){
+        for(IEMDefinition definition: EMDefinitionsRegistry.getStacksRegisteredForDisplay()){
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT))));
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 144 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_144))));
             list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1000 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
index 4a0bb55784..3015d024c7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
@@ -8,7 +8,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayRe
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.templates.EMPrimitive;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
@@ -108,7 +108,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         });
         registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
         registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(EMPrimitive.getClassTypeStatic());
+        registerSimpleAtomFuse(EMPrimitiveTemplate.getClassTypeStatic());
 
         FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
             @Override
@@ -135,7 +135,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                 return 2;
             }
         });
-        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
             @Override
             public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 try {
@@ -162,9 +162,9 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         });
 
         registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAspectFuse(EMPrimitive.getClassTypeStatic());
+        registerSimpleAspectFuse(EMPrimitiveTemplate.getClassTypeStatic());
 
-        FUSE_HANDLERS.put((EMPrimitive.getClassTypeStatic() << 16) | EMPrimitive.getClassTypeStatic(), new IColliderHandler() {
+        FUSE_HANDLERS.put((EMPrimitiveTemplate.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
             @Override
             public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
                 IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 466f82071b..e769d3e480 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -26,7 +26,7 @@ import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 630569a25d..64949fe402 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -29,8 +29,8 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.DEFAULT_ENERGY_LEVEL;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.templates.IEMDefinition.STABLE_RAW_LIFE_TIME;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.DEFAULT_ENERGY_LEVEL;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
-- 
cgit 


From 436fdbfdaacbadbb776251fd04b75e5acbe84f4c Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 18 Jan 2022 22:25:23 +0100
Subject: Cleanup some Locale

(cherry picked from commit 975bf105794ac48b1415d4e78946449fbb68bcaf)
---
 .../tectech/loader/recipe/RecipeLoader.java        |  2 +-
 .../core/definitions/EMPrimitiveTemplate.java      | 11 +++++-----
 .../definitions/complex/EMAtomDefinition.java      |  7 +++---
 .../definitions/complex/EMHadronDefinition.java    | 25 +++++++++++-----------
 .../definitions/primitive/EMBosonDefinition.java   |  3 ++-
 .../definitions/primitive/EMLeptonDefinition.java  |  3 ++-
 .../primitive/EMNeutrinoDefinition.java            |  3 ++-
 .../primitive/EMPrimitiveDefinition.java           |  3 ++-
 .../definitions/primitive/EMQuarkDefinition.java   |  3 ++-
 9 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
index 7cd5a25f4a..2a572d87de 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
@@ -35,7 +35,7 @@ public class RecipeLoader implements Runnable {
 
     @Override
     public void run() {
-        EMAtomDefinition.setTransformation();
+        EMAtomDefinition.setTransformations();
         EMHadronDefinition.setTransformations();
 
         // ===================================================================================================
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index f3ce34dd1d..b529b79cc0 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
@@ -61,11 +62,6 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         EMDefinitionsRegistry.registerForDisplay(this);
     }
 
-    @Override
-    public String getLocalizedName() {
-        return "Undefined: " + getName();
-    }
-
     @Override
     public String getSymbol() {
         return symbol;
@@ -183,6 +179,11 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         return nbt;
     }
 
+    @Override
+    protected final int getIndirectTagValue() {
+        throw new EMException("This class should only be used directly!");
+    }
+
     @Override
     public final byte getClassType() {
         return getClassTypeStatic();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 666249f408..878c2a6627 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -33,6 +33,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.definitions.p
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
 import static gregtech.api.enums.OrePrefixes.dust;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 18.11.2016.
@@ -348,7 +349,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
-            return (negative ? "Element: ~" : "Element: ") + element;
+            return translateToLocal("tt.keyword.Element")+(negative ? ": ~" : ": ") + element;
         }
     }
 
@@ -1476,7 +1477,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
     }
 
-    public static void setTransformation(){
+    public static void setTransformations(){
         /*----STABLE ATOMS----**/
         refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
 
@@ -1666,7 +1667,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
         }
         if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+ getLocalizedName());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index a901f5c8fc..70092aa735 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -31,6 +31,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static gregtech.api.enums.OrePrefixes.dust;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 17.11.2016.
@@ -141,7 +142,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     public String getLocalizedName() {
         StringBuilder name= new StringBuilder(getSimpleName());
         name.append(':');
-        String sym= NAME_MAP.get(this);
+        String sym= translateToLocal(NAME_MAP.get(this));
         if(sym!=null){
             name.append(' ').append(sym);
         }else {
@@ -155,17 +156,17 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     private String getSimpleName() {
         switch (getAmount()) {
             case 2:
-                return "Meson";
+                return translateToLocal("tt.keyword.Meson");
             case 3:
-                return "Baryon";
+                return translateToLocal("tt.keyword.Baryon");
             case 4:
-                return "Tetraquark";
+                return translateToLocal("tt.keyword.Tetraquark");
             case 5:
-                return "Pentaquark";
+                return translateToLocal("tt.keyword.Pentaquark");
             case 6:
-                return "Hexaquark";
+                return translateToLocal("tt.keyword.Hexaquark");
             default:
-                return "Hadron";
+                return translateToLocal("tt.keyword.Hadron");
         }
     }
 
@@ -413,22 +414,22 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
             SYMBOL_MAP.put(hadron_p,"p");
-            NAME_MAP.put(hadron_p,"Proton");
+            NAME_MAP.put(hadron_p,translateToLocal("tt.keyword.Proton"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p);
             hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
             SYMBOL_MAP.put(hadron_p_,"~p");
-            NAME_MAP.put(hadron_p_,"Anti Proton");
+            NAME_MAP.put(hadron_p_,translateToLocal("tt.keyword.AntiProton"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p_);
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.getMass();
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
-            NAME_MAP.put(hadron_n, "Neutron");
+            NAME_MAP.put(hadron_n,translateToLocal("tt.keyword.Neutron"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n);
             hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
             SYMBOL_MAP.put(hadron_n_,"~n");
-            NAME_MAP.put(hadron_n_,"Anti Neutron");
+            NAME_MAP.put(hadron_n_,translateToLocal("tt.keyword.AntiNeutron"));
             EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n_);
         } catch (EMException e) {
             if (DEBUG_MODE) {
@@ -491,7 +492,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + nbtType + ' ' + getClassType());
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
         }
         if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+getSimpleName());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index 5f14eefcdb..f20f872a6e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMP
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -35,7 +36,7 @@ public final class EMBosonDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Boson: " + getName();
+        return translateToLocal("tt.keyword.Boson")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index 0f9898775f..38e537ec59 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMP
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -59,7 +60,7 @@ public final class EMLeptonDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Lepton: " + getName();
+        return translateToLocal("tt.keyword.Lepton")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index ac06a80728..9af7b97cb4 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -5,6 +5,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefini
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -49,7 +50,7 @@ public final class EMNeutrinoDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Lepton: " + getName();
+        return translateToLocal("tt.keyword.Neutrino")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index e4a92fbae1..41da06567d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -3,6 +3,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.definitions.primiti
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -29,7 +30,7 @@ public final class EMPrimitiveDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Primitive: " + getName();
+        return translateToLocal("tt.keyword.Primitive")+": " + getName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index 9afa04d243..3f19205aeb 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -5,6 +5,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMP
 
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -96,7 +97,7 @@ public final class EMQuarkDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return "Quark: " + getName();
+        return translateToLocal("tt.keyword.Quark")+": " + getName();
     }
 
     @Override
-- 
cgit 


From bfc503b010c652be703fc6da016cede6d5b41465 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 18 Jan 2022 22:33:13 +0100
Subject: Minor fixes

(cherry picked from commit 62021d238a0c38401b50211d59e72e169399f444)
---
 .../elementalMatter/definitions/EMComplexAspectDefinition.java          | 2 +-
 .../mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java | 2 +-
 .../elementalMatter/definitions/complex/EMHadronDefinition.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index e56e31f166..a062fa0dab 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -48,7 +48,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     private EMComplexAspectDefinition(boolean check, EMConstantStackMap aspects) throws EMException {
         if (check && !canTheyBeTogether(aspects)) {
-            throw new EMException("Hadron Definition error");
+            throw new EMException("Complex Aspect Definition error");
         }
         aspectStacks = aspects;
         float mass = 0;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 878c2a6627..37ecb861f8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -72,7 +72,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     private final int    charge;
     //int -electric charge in 1/3rds of electron charge for optimization
     private final int    chargeLeptons;
-    private       double rawLifeTime;
+    private final double rawLifeTime;
     //generation max present inside - minus if contains any anti quark
     private final byte   type;
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index 70092aa735..c1db8e4460 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -101,7 +101,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         this.amount = amount;
         this.charge = charge;
         this.type = containsAnti ? (byte) -type : (byte) type;
-        long mult = this.getAmount() * this.getAmount() * (this.getAmount() - 1);
+        long mult = (long) this.getAmount() * this.getAmount() * (this.getAmount() - 1);
         mass = mass * 5.543D * mult;//yes it becomes heavier
 
         if (mass == protonMass && this.getAmount() == 3) {
-- 
cgit 


From 967353ed74d8f177ef641261899327b9fabb2ecc Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sat, 22 Jan 2022 23:33:56 +0100
Subject: cherry pick

Rework API, add locale
---
 .../java/com/github/technus/tectech/TecTech.java   |   19 +-
 .../dreamcraft/DreamCraftRecipeLoader.java         |    8 +-
 .../tectech/compatibility/gtpp/GtppAtomLoader.java |   76 +-
 .../blocks/turretbases/TurretBaseEM.java           |    2 +-
 .../blocks/turretheads/TurretHeadEM.java           |    2 +-
 .../entity/projectiles/projectileEM.java           |    4 +-
 .../tileentity/turret/TileTurretHeadEM.java        |    6 +-
 .../spartakcore/SpartakCoreRecipeLoader.java       |    9 +-
 .../definitions/EMComplexAspectDefinition.java     |   78 +-
 .../definitions/EMPrimalAspectDefinition.java      |   41 +-
 .../transformations/AspectDefinitionCompat.java    |    7 +-
 .../AspectDefinitionCompatEnabled.java             |   11 +-
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |    8 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |    4 +-
 .../technus/tectech/loader/ElementalLoader.java    |   29 +-
 .../github/technus/tectech/loader/MainLoader.java  |   37 +-
 .../tectech/loader/gui/CreativeTabTecTech.java     |    2 -
 .../tectech/loader/recipe/BaseRecipeLoader.java    |  124 ++
 .../tectech/loader/recipe/BloodyRecipeLoader.java  |    6 +-
 .../tectech/loader/recipe/RecipeLoader.java        |  120 --
 .../tectech/loader/thing/MachineLoader.java        |   15 +-
 .../tectech/mechanics/anomaly/AnomalyHandler.java  |   14 +-
 .../elementalMatter/core/EMException.java          |    3 -
 .../elementalMatter/core/commands/EMGive.java      |  118 +-
 .../elementalMatter/core/commands/EMList.java      |   56 +-
 .../core/definitions/EMComplexTemplate.java        |   20 +-
 .../core/definitions/EMDefinitionsRegistry.java    |  110 --
 .../core/definitions/EMPrimitiveTemplate.java      |   67 +-
 .../core/definitions/IEMDefinition.java            |   32 +-
 .../registry/EMDefinitionsRegistry.java            |  189 ++++
 .../core/definitions/registry/EMIndirectType.java  |   37 +
 .../core/definitions/registry/EMType.java          |   63 ++
 .../core/maps/EMConstantStackMap.java              |    5 +-
 .../core/maps/EMDefinitionStackMap.java            |    5 +-
 .../core/maps/EMInstanceStackMap.java              |   32 +-
 .../elementalMatter/core/maps/IEMMapRead.java      |   20 +-
 .../elementalMatter/core/maps/IEMMapWrite.java     |   12 +-
 .../core/maps/IEMMapWriteExact.java                |    6 +-
 .../core/stacks/EMDefinitionStack.java             |   10 +-
 .../core/stacks/EMInstanceStack.java               |   61 +-
 .../elementalMatter/core/stacks/IEMStack.java      |   33 +-
 .../core/transformations/EMDequantizationInfo.java |   56 +
 .../transformations/EMFluidDequantizationInfo.java |   43 -
 .../transformations/EMFluidQuantizationInfo.java   |    4 +-
 .../transformations/EMItemDequantizationInfo.java  |   45 -
 .../transformations/EMItemQuantizationInfo.java    |    4 +-
 .../EMOredictDequantizationInfo.java               |   60 -
 .../transformations/EMOredictQuantizationInfo.java |   41 +-
 .../core/transformations/EMTransformationInfo.java |  165 ---
 .../transformations/EMTransformationRegistry.java  |  134 +++
 .../core/transformations/IEMExchangeInfo.java      |   11 -
 .../core/transformations/OreDictionaryStack.java   |   19 +
 .../definitions/complex/EMAtomDefinition.java      | 1187 ++++++++++----------
 .../definitions/complex/EMHadronDefinition.java    |  229 ++--
 .../definitions/primitive/EMBosonDefinition.java   |   38 +-
 .../definitions/primitive/EMFermionDefinition.java |   16 +
 .../primitive/EMGaugeBosonDefinition.java          |   83 ++
 .../definitions/primitive/EMLeptonDefinition.java  |   43 +-
 .../primitive/EMNeutrinoDefinition.java            |   41 +-
 .../primitive/EMPrimitiveDefinition.java           |   50 +-
 .../definitions/primitive/EMQuarkDefinition.java   |   87 +-
 .../primitive/EMScalarBosonDefinition.java         |   46 +
 .../github/technus/tectech/recipe/TT_recipe.java   |   19 +-
 .../tectech/thing/block/QuantumGlassBlock.java     |    2 +-
 .../tectech/thing/casing/GT_Block_CasingsNH.java   |    2 +-
 .../tectech/thing/casing/GT_Block_CasingsTT.java   |    2 +-
 .../tectech/thing/casing/GT_Block_HintTT.java      |    2 +-
 .../technus/tectech/thing/item/AvrProgrammer.java  |    2 +-
 .../thing/item/ConstructableTriggerItem.java       |    2 +-
 .../item/DebugElementalInstanceContainer_EM.java   |   32 +-
 .../item/ElementalDefinitionContainer_EM.java      |   11 +-
 .../item/ElementalDefinitionScanStorage_EM.java    |    2 +-
 .../technus/tectech/thing/item/EuMeterGT.java      |    2 +-
 .../thing/item/FrontRotationTriggerItem.java       |    2 +-
 .../tectech/thing/item/ParametrizerMemoryCard.java |    2 +-
 .../tectech/thing/metaTileEntity/Textures.java     |    2 +-
 ...GT_MetaTileEntity_Hatch_ElementalContainer.java |    8 +-
 .../multi/GT_MetaTileEntity_EM_collider.java       |  717 ------------
 .../multi/GT_MetaTileEntity_EM_decay.java          |    4 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |   49 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   11 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        |   10 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |    4 +-
 .../em_collider/GT_MetaTileEntity_EM_collider.java |  709 ++++++++++++
 .../multi/em_collider/IColliderHandler.java        |    5 +
 .../em_collider/IPrimitiveColliderHandler.java     |    8 +
 .../multi/em_machine/Behaviour_Centrifuge.java     |    7 +-
 .../Behaviour_ElectromagneticSeparator.java        |    9 +-
 .../github/technus/tectech/util/DoubleCount.java   |    6 +
 .../java/com/github/technus/tectech/util/Util.java |   12 +
 src/main/resources/assets/tectech/lang/en_US.lang  |  103 +-
 91 files changed, 2933 insertions(+), 2716 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
 delete mode 100644 src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
 create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
 create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java
 create mode 100644 src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index ef5e146bfa..d730d64a65 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech;
 
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.TecTechConfig;
+import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
 import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler;
 import com.github.technus.tectech.mechanics.anomaly.CancerCommand;
 import com.github.technus.tectech.mechanics.anomaly.ChargeCommand;
@@ -11,6 +12,8 @@ import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerPersistence;
 import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMGive;
 import com.github.technus.tectech.mechanics.elementalMatter.core.commands.EMList;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.proxy.CommonProxy;
 import com.github.technus.tectech.util.XSTR;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -41,7 +44,8 @@ public class TecTech {
     public static TecTech instance;
 
     public static final XSTR RANDOM = XSTR.XSTR_INSTANCE;
-    public static final LogHelper LOGGER = new LogHelper(Reference.MODID);
+    public static final LogHelper          LOGGER = new LogHelper(Reference.MODID);
+    public static       CreativeTabTecTech creativeTabTecTech;
 
     private static IngameErrorLog moduleAdminErrorLogs;
     public static TecTechConfig configTecTech;
@@ -50,6 +54,9 @@ public class TecTech {
     public static AnomalyHandler anomalyHandler;
     public static PlayerPersistence playerPersistence;
 
+    public static final EMDefinitionsRegistry    definitionsRegistry =new EMDefinitionsRegistry();
+    public static final EMTransformationRegistry transformationInfo  =new EMTransformationRegistry();
+
     /**
      * For Loader.isModLoaded checks during the runtime
      */
@@ -106,7 +113,7 @@ public class TecTech {
                 Field field= GT_Proxy.class.getDeclaredField("mEvents");
                 field.setAccessible(true);
                 modifiersField.setInt( field, field.getModifiers() & ~Modifier.FINAL );
-                field.set(GT_Mod.gregtechproxy, new Collection() {
+                field.set(GT_Mod.gregtechproxy, new Collection<Object>() {
                     @Override
                     public int size() {
                         return 0;
@@ -123,8 +130,8 @@ public class TecTech {
                     }
 
                     @Override
-                    public Iterator iterator() {
-                        return new Iterator() {
+                    public Iterator<Object> iterator() {
+                        return new Iterator<Object>() {
                             @Override
                             public boolean hasNext() {
                                 return false;
@@ -188,13 +195,13 @@ public class TecTech {
 
         }
 
-        MainLoader.load();
+        MainLoader.load(definitionsRegistry);
         MainLoader.addAfterGregTechPostLoadRunner();
     }
 
     @Mod.EventHandler
     public void PostLoad(FMLPostInitializationEvent PostEvent) {
-        MainLoader.postLoad();
+        MainLoader.postLoad(definitionsRegistry,transformationInfo);
 
         chunkDataHandler.registerChunkMetaDataHandler(anomalyHandler=new AnomalyHandler());
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 5abd11a86d..f520885f9e 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.compatibility.dreamcraft;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -23,12 +24,12 @@ import net.minecraftforge.fluids.FluidStack;
 
 import java.lang.reflect.Method;
 
-import static com.github.technus.tectech.loader.recipe.RecipeLoader.getOrDefault;
+import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault;
 
 /**
  * Created by Tec on 06.08.2017.
  */
-public class DreamCraftRecipeLoader implements Runnable {
+public class DreamCraftRecipeLoader {
     //region reflect a bit
     @SuppressWarnings("rawtypes")
     private Class CUSTOM_ITEM_LIST;
@@ -48,8 +49,7 @@ public class DreamCraftRecipeLoader implements Runnable {
     }
     //endregion
 
-    @Override
-    public void run() {
+    public void run(EMTransformationRegistry transformationInfo) {
         //region reflect a bit
         try {
             CUSTOM_ITEM_LIST = Class.forName("com.dreammaster.gthandler.CustomItemList");
diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index 73d2955548..67a363fc6c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -1,18 +1,19 @@
 package com.github.technus.tectech.compatibility.gtpp;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.lang.reflect.Method;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getBestUnstableIsotope;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.getFirstStableIsotope;
 
-public class GtppAtomLoader implements Runnable{
+public class GtppAtomLoader {
     //region reflect a bit
-    private Class ELEMENT;
+    private Class<?> ELEMENT;
     private Object ELEMENT_INSTANCE;
     private Method getUnlocalizedName,getFluid,generate;
 
@@ -41,16 +42,7 @@ public class GtppAtomLoader implements Runnable{
     }
     //endregion
 
-    private static Method getMethodWithReplacements(Class<?> owner, String name1, String name2, Class<?>... arguments) throws ReflectiveOperationException {
-        try {
-            return owner.getMethod(name1, arguments);
-        } catch (ReflectiveOperationException e) {
-            return owner.getMethod(name2, arguments);
-        }
-    }
-
-    @Override
-    public void run() {
+    public void setTransformations(EMTransformationRegistry transformationInfo) {
         //region reflect a bit
         try{
             ELEMENT=Class.forName("gtPlusPlus.core.material.ELEMENT");
@@ -58,7 +50,7 @@ public class GtppAtomLoader implements Runnable{
 
             Class<?> clazz=Class.forName("gtPlusPlus.core.material.Material");
             getUnlocalizedName=clazz.getMethod("getUnlocalizedName");
-            getFluid=getMethodWithReplacements(clazz,"getFluidStack", "getFluid", int.class);
+            getFluid=clazz.getMethod("getFluid", int.class);
 
             clazz=Class.forName("gtPlusPlus.core.material.MaterialGenerator");
             generate=clazz.getMethod("generate", Class.forName("gtPlusPlus.core.material.Material"), boolean.class, boolean.class);
@@ -67,34 +59,34 @@ public class GtppAtomLoader implements Runnable{
         }
         //endregion
 
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144), getFluid("NEON",144));
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), getFluid("NEON",144));
         generate("GERMANIUM",true,true);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144), getFluid("BROMINE",144));
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144), getFluid("KRYPTON",144));
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),getFluid("XENON",144));
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), OrePrefixes.dust, getUnlocalizedName("GERMANIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), OrePrefixes.dust, getUnlocalizedName("SELENIUM"),1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(35), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), getFluid("BROMINE",144));
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(36), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), getFluid("KRYPTON",144));
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("ZIRCONIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("TECHNETIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RUTHENIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RHODIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("IODINE"),1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),getFluid("XENON",144));
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("HAFNIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RHENIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("THALLIUM"),1);
 
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(85), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("POLONIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(85), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("ASTATINE"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("FRANCIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("RADIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("ACTINIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("PROTACTINIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("NEPTUNIUM"),1);
 
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(96), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(97), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(98), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(99), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(100), AVOGADRO_CONSTANT_144),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(96), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("CURIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(97), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("BERKELIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(98), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("CALIFORNIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(99), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("EINSTEINIUM"),1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(100), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED),OrePrefixes.dust, getUnlocalizedName("FERMIUM"),1);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
index 9da3b82b40..654b4e37a6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretbases/TurretBaseEM.java
@@ -10,7 +10,7 @@ import net.minecraft.world.World;
 import openmodularturrets.blocks.turretbases.BlockAbstractTurretBase;
 import openmodularturrets.handler.ConfigHandler;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by Tec on 27/07/2017.
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
index 7b7167b915..da212d4853 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/blocks/turretheads/TurretHeadEM.java
@@ -11,7 +11,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import openmodularturrets.tileentity.turretbase.TurretBase;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by Tec on 27/07/2017.
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
index 785b59f093..54bd3aaea5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/entity/projectiles/projectileEM.java
@@ -52,10 +52,10 @@ public class projectileEM extends LaserProjectile {
             charge=projectileContent.getCharge();
             massFactor =(float) (projectileContent.getDefinition().getMass()/ EMHadronDefinition.hadron_n_.getMass());
 
-            if(projectileContent.getDefinition().getMatterType()>1 || projectileContent.getDefinition().getMatterType()<-1) {
+            if(projectileContent.getDefinition().getGeneration()>1 || projectileContent.getDefinition().getGeneration()<-1) {
                 strange = true;
             }
-            if(projectileContent.getDefinition().getMatterType()<0) {
+            if(projectileContent.getDefinition().getGeneration()<0) {
                 antiMatter = true;
             }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
index 6dc5c4f60a..742232d8c6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/openmodularturrets/tileentity/turret/TileTurretHeadEM.java
@@ -14,7 +14,7 @@ import openmodularturrets.handler.ConfigHandler;
 import openmodularturrets.tileentity.turrets.TurretHead;
 import openmodularturrets.util.TurretHeadUtil;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 
 /**
  * Created by Bass on 27/07/2017.
@@ -71,8 +71,8 @@ public class TileTurretHeadEM extends TurretHead{
             return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), null);
         }
         EMInstanceStack stack  = hatchContentPointer.getRandom();
-        double          amount = Math.min(AVOGADRO_CONSTANT, stack.getAmount());
-        hatchContentPointer.removeAmount(stack.getDefinition(),AVOGADRO_CONSTANT);
+        double          amount = Math.min(EM_COUNT_PER_MATERIAL_AMOUNT, stack.getAmount());
+        hatchContentPointer.removeAmount(stack.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT);
         stack=stack.clone();
         stack.setAmount(amount);
         return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), stack);
diff --git a/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java
index 3fabfd67b2..b2050bbac5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/spartakcore/SpartakCoreRecipeLoader.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.compatibility.spartakcore;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -19,15 +20,13 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
-import static com.github.technus.tectech.loader.recipe.RecipeLoader.getOrDefault;
+import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getOrDefault;
 
 /**
  * Created by Spartak1997 on 28.07.2019.
  */
-public class SpartakCoreRecipeLoader implements Runnable {
-    
-    @Override
-    public void run() {
+public class SpartakCoreRecipeLoader {
+    public void run(EMTransformationRegistry transformationInfo) {
         
       //Quantum Glass
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index a062fa0dab..40419604e4 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -2,24 +2,21 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.defi
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
-import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
-import net.minecraft.nbt.NBTTagCompound;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import com.github.technus.tectech.util.Util;
 
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -30,7 +27,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     private final int    hash;
     private final double mass;
 
-    private static final byte nbtType = (byte) 'c';
+    private static final String nbtType = "`";
 
     private final EMConstantStackMap aspectStacks;
 
@@ -76,7 +73,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     @Override
     public String getLocalizedName() {
-        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectTag(this);
+        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
         if (name != null) {
             name = name.substring(0, 1).toUpperCase() + name.substring(1);
         } else {
@@ -124,25 +121,10 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     }
 
     @Override
-    protected int getIndirectTagValue() {
+    protected String getIndirectTagValue() {
         return nbtType;
     }
 
-    public static EMComplexAspectDefinition fromNBT(NBTTagCompound nbt) {
-        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new EMComplexAspectDefinition(stacks);
-        } catch (EMException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
     @Override
     public double getRawTimeSpan(long currentEnergy) {
         return -1;
@@ -159,12 +141,12 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getMatterType() {
+    public int getGeneration() {
         return 0;
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return -1;
     }
 
@@ -175,7 +157,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
-        return new EMDecay[]{new EMDecay(0.75F, aspectStacks), EMBosonDefinition.deadEnd};
+        return new EMDecay[]{new EMDecay(0.75F, aspectStacks), deadEnd};
     }
 
     @Override
@@ -218,45 +200,25 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
         return mass;
     }
 
-    @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
     @Override
     public IEMDefinition getAnti() {
         return null;
     }
 
-    public static void run() {
-        try {
-            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMComplexAspectDefinition::fromNBT,EMComplexAspectDefinition.class, getClassTypeStatic());
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(nbtType, new EMIndirectType((definitionsRegistry, nbt)->
+                new EMComplexAspectDefinition(EMConstantStackMap.fromNBT(definitionsRegistry,nbt)), EMComplexAspectDefinition.class, "tt.keyword.Aspect"));
         if (DEBUG_MODE) {
             TecTech.LOGGER.info("Registered Elemental Matter Class: ComplexAspect " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
     @Override
-    public byte getClassType() {
+    public int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic() {
+    public static int getClassTypeStatic() {
         return -96;
     }
 
@@ -275,7 +237,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getClassType());
+            lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getMatterMassType());
         }
         if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.NAME") + " = " + getLocalizedName());
@@ -285,7 +247,7 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
             lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
         }
         if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
-            lines.add(getColor() < 0 ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
+            lines.add(hasColor() ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
         }
         if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
index e62c2e5278..885a71ef28 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -1,6 +1,9 @@
 package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions;
 
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -10,29 +13,35 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     public static final EMPrimalAspectDefinition
-            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 35),
-            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 34),
-            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 33),
-            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 32),
-            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 30),
-            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Entropy"), "e`", 1e5D, 31);
+            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 45,"a`"),
+            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 44,"e`"),
+            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 43,"f`"),
+            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 42,"w`"),
+            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 40,"o`"),
+            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Chaos"), "c`", 1e5D, 41,"c`");
 
-    private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID) {
-        super(name, symbol, 0, mass, 0, -1, ID);
+    private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID,String bind) {
+        super(name, symbol, 0, mass, 0, -1, ID,bind);
     }
 
-    public static void run() {
-        magic_air.init(null, -1F, -1, -1, NO_DECAY);
-        magic_earth.init(null, -1F, -1, -1, NO_DECAY);
-        magic_fire.init(null, -1F, -1, -1, NO_DECAY);
-        magic_water.init(null, -1F, -1, -1, NO_DECAY);
-        magic_order.init(null, -1F, -1, -1, NO_DECAY);
-        magic_entropy.init(null, -1F, -1, -1, NO_DECAY);
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMPrimalAspectDefinition.class,"tt.keyword.Primal"));
+        magic_air.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_earth.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_fire.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_water.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_order.init(registry,null, -1F, -1, -1, NO_DECAY);
+        magic_entropy.init(registry,null, -1F, -1, -1, NO_DECAY);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Primal") + ": " + getName();
+        String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
+        if (name != null) {
+            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName()+" ("+name+")";
+        } else {
+            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName();
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
index a4328d2e03..c1c6c6dcb2 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompat.java
@@ -2,6 +2,7 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.tran
 
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 
 import java.util.HashMap;
 
@@ -13,12 +14,16 @@ public class AspectDefinitionCompat {
     private final HashMap<IEMDefinition,String>  defToAspect = new HashMap<>();
     private final HashMap<String, IEMDefinition> aspectToDef = new HashMap<>();
 
-    public void run(){}
+    public void run(EMDefinitionsRegistry registry){}
 
     public String getAspectTag(IEMDefinition definition){
         return null;
     }
 
+    public String getAspectLocalizedName(IEMDefinition definition){
+        return null;
+    }
+
     public IEMDefinition getDefinition(String aspect){
         return null;
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
index ead8a5fdef..ccccff7c3d 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/transformations/AspectDefinitionCompatEnabled.java
@@ -2,20 +2,20 @@ package com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.tran
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import thaumcraft.api.aspects.Aspect;
 
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry.STACKS_REGISTERED;
 
 /**
  * Created by Tec on 21.05.2017.
  */
 public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat {
     @Override
-    public void run(){
+    public void run(EMDefinitionsRegistry registry){
         getDefToAspect().put(magic_air,"aer");
         getDefToAspect().put(magic_earth,"terra");
         getDefToAspect().put(magic_fire,"ignis");
@@ -51,6 +51,7 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                             }
                             getAspectToDef().put(aspect.getTag(),newAspect);
                             getDefToAspect().put(newAspect,aspect.getTag());
+                            registry.registerForDisplay(newAspect);
                         }catch (EMException e) {
                             /**/
                         }finally {
@@ -60,7 +61,6 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
                 }
             }
         }
-        STACKS_REGISTERED.addAll(getDefToAspect().keySet());
     }
 
     @Override
@@ -68,6 +68,11 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat
         return getDefToAspect().get(definition);
     }
 
+    public String getAspectLocalizedName(IEMDefinition definition){
+        Aspect aspect = Aspect.aspects.get(getAspectTag(definition));
+        return aspect != null ? aspect.getName() : null;
+    }
+
     @Override
     public IEMDefinition getDefinition(String aspect) {
         return getAspectToDef().get(aspect);
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index dbcbe7d86b..267af79784 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -26,8 +26,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_ITEM_DIMINISHED;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -100,7 +100,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
         }
 
         EMInstanceStack stack = inputHatchContainer.getRandom();
-        if (stack.getAmount() < AVOGADRO_CONSTANT_DIMINISHED) {
+        if (stack.getAmount() < EM_COUNT_PER_ITEM_DIMINISHED) {
             cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
             mEUt = (int) -V[6];
         } else {
@@ -111,7 +111,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
                 cleanStackEM_EM(inputHatchContainer.removeKey(stack.getDefinition()));
                 mEUt = (int) -V[7];
             } else {
-                inputHatchContainer.removeAmount(stack.getDefinition().getStackForm(AVOGADRO_CONSTANT));
+                inputHatchContainer.removeAmount(stack.getDefinition().getStackForm(EM_COUNT_PER_MATERIAL_AMOUNT));
                 if (aspect.isPrimal()) {
                     mEUt = (int) -V[8];
                 } else {
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index 5fe8c973fe..a381a37f89 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -25,7 +25,7 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -90,7 +90,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
             mEfficiencyIncrease = 10000;
             eAmpereFlow = 1;
             outputEM = new EMInstanceStackMap[]{
-                    new EMInstanceStackMap(new EMInstanceStack(definition,AVOGADRO_CONSTANT))
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))
             };
             if (definition instanceof EMPrimalAspectDefinition) {
                 mEUt = (int) -V[8];
diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index 61989e7b13..773361bd0f 100644
--- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -2,36 +2,33 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMNuclideIAEA;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.*;
 
 /**
  * Created by danie_000 on 16.11.2016.
  */
-public class ElementalLoader implements Runnable {
-    @Override
-    public void run() {
+public class ElementalLoader {
+    public void run(EMDefinitionsRegistry registry) {
         // ===================================================================================================
         // Definition init
         // ===================================================================================================
 
-        EMPrimitiveDefinition.run();
+        EMPrimitiveDefinition.run(registry);
 
-        EMQuarkDefinition.run();
-        EMLeptonDefinition.run();
-        EMNeutrinoDefinition.run();
-        EMBosonDefinition.run();
+        EMQuarkDefinition.run(registry);
+        EMLeptonDefinition.run(registry);
+        EMNeutrinoDefinition.run(registry);
+        EMGaugeBosonDefinition.run(registry);
+        EMScalarBosonDefinition.run(registry);
 
-        EMHadronDefinition.run();
+        EMHadronDefinition.run(registry);
 
-        EMNuclideIAEA.run();
+        EMAtomDefinition.run(registry);
 
-        EMAtomDefinition.run();
-
-        EMPrimalAspectDefinition.run();
-
-        EMComplexAspectDefinition.run();
+        EMPrimalAspectDefinition.run(registry);
+        EMComplexAspectDefinition.run(registry);
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 02fae0e194..e2f1e2882f 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -8,14 +8,16 @@ import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompatEnabled;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
-import com.github.technus.tectech.loader.recipe.RecipeLoader;
+import com.github.technus.tectech.loader.recipe.BaseRecipeLoader;
 import com.github.technus.tectech.loader.thing.ComponentLoader;
 import com.github.technus.tectech.loader.thing.CoverLoader;
 import com.github.technus.tectech.loader.thing.MachineLoader;
 import com.github.technus.tectech.loader.thing.ThingsLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.Textures;
-import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_collider;
+import com.github.technus.tectech.thing.metaTileEntity.multi.em_collider.GT_MetaTileEntity_EM_collider;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ProgressManager;
 import cpw.mods.fml.common.network.NetworkRegistry;
@@ -43,7 +45,7 @@ import static com.github.technus.tectech.TecTech.*;
 import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.transformations.AspectDefinitionCompat.aspectDefinitionCompat;
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static gregtech.api.enums.GT_Values.W;
 
 public final class MainLoader {
@@ -65,17 +67,17 @@ public final class MainLoader {
 
         //set expanded texture arrays for tiers
         try {
-            new Textures();
+            Textures.run();
         }catch (Throwable t){
             LOGGER.error("Loading textures...",t);
         }
     }
 
-    public static void load() {
+    public static void load(EMDefinitionsRegistry registry) {
         ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 9);
 
         progressBarLoad.step("Elemental Things");
-        new ElementalLoader().run();
+        new ElementalLoader().run(registry);
         LOGGER.info("Elemental Init Done");
 
         progressBarLoad.step("Thaumcraft Compatibility");
@@ -120,8 +122,8 @@ public final class MainLoader {
         ProgressManager.pop(progressBarLoad);
     }
 
-    public static void postLoad() {
-        ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 5);
+    public static void postLoad(EMDefinitionsRegistry registry, EMTransformationRegistry transformationInfo) {
+        ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 6);
 
         progressBarPostLoad.step("Dreamcraft Compatibility");
         if(Loader.isModLoaded(Reference.DREAMCRAFT)){
@@ -138,21 +140,16 @@ public final class MainLoader {
         }
 
         progressBarPostLoad.step("Thaumcraft Compatibility");
-        if (Loader.isModLoaded(Reference.THAUMCRAFT)) {
-            aspectDefinitionCompat = new AspectDefinitionCompatEnabled();
-            aspectDefinitionCompat.run();
-        } else {
-            aspectDefinitionCompat = new AspectDefinitionCompat();
-        }
+        aspectDefinitionCompat = Loader.isModLoaded(Reference.THAUMCRAFT) ? new AspectDefinitionCompatEnabled() : new AspectDefinitionCompat();
+        aspectDefinitionCompat.run(registry);
 
         progressBarPostLoad.step("Recipes");
-        new RecipeLoader().run();
+        new BaseRecipeLoader().run(transformationInfo);
         TecTech.LOGGER.info("Recipe Init Done");
 
-        //Hazmat moved to GT5U
-        //progressBarPostLoad.step("Register Extra Hazmat Suits");
-        //registerExtraHazmats();
-        //TecTech.LOGGER.info("Hazmat additions done");
+        progressBarPostLoad.step("Register Extra Hazmat Suits");
+        registerExtraHazmats();
+        TecTech.LOGGER.info("Hazmat additions done");
 
         if (!configTecTech.DISABLE_BLOCK_HARDNESS_NERF) {
             progressBarPostLoad.step("Nerf blocks blast resistance");
@@ -170,7 +167,7 @@ public final class MainLoader {
         ProgressManager.pop(progressBarPostLoad);
     }
 
-    private static void registerExtraHazmats() { //Hazmat moved to GT5U
+    private static void registerExtraHazmats() {
         ItemStack EMT_iqC=GT_ModHandler.getModItem("EMT","itemArmorQuantumChestplate",1,W);
         ItemStack GRAVI_gC=GT_ModHandler.getModItem("GraviSuite","graviChestPlate",1,W);
         ItemStack GRAVI_anC=GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, W);
diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
index d360162fb6..e5b9fea395 100644
--- a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
+++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabTecTech.java
@@ -11,8 +11,6 @@ import net.minecraft.item.Item;
 import java.util.List;
 
 public class CreativeTabTecTech extends CreativeTabs {
-    public static CreativeTabTecTech creativeTabTecTech;
-
     public CreativeTabTecTech(String name) {
         super(name);
     }
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
new file mode 100644
index 0000000000..5dc4d09b1a
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
@@ -0,0 +1,124 @@
+package com.github.technus.tectech.loader.recipe;
+
+import com.github.technus.tectech.Reference;
+import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader;
+import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
+import com.github.technus.tectech.compatibility.spartakcore.SpartakCoreRecipeLoader;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.thing.CustomItemList;
+import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
+import com.github.technus.tectech.thing.item.EuMeterGT;
+import com.github.technus.tectech.thing.item.FrontRotationTriggerItem;
+import cpw.mods.fml.common.Loader;
+import gregtech.api.enums.Dyes;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import static gregtech.api.enums.GT_Values.RA;
+
+/**
+ * Created by danie_000 on 16.11.2016.
+ */
+public class BaseRecipeLoader {
+    public static Materials getOrDefault(String name,Materials def){
+        Materials mat=Materials.get(name);
+        return mat == Materials._NULL || mat == null ? def : mat;
+    }
+
+    public void run(EMTransformationRegistry transformationInfo) {
+        EMAtomDefinition.setTransformations(transformationInfo);
+        EMHadronDefinition.setTransformations(transformationInfo);
+        if (Loader.isModLoaded(Reference.GTPLUSPLUS)) {
+            new GtppAtomLoader().setTransformations(transformationInfo);
+        }
+
+        // ===================================================================================================
+        // Recipes init - common goes here rest goes into methods below
+        // ===================================================================================================
+
+        for(int i=0;i<=15;i++) {
+            RA.addAssemblerRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(i), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1)}, Materials.Aluminium.getMolten(864), new ItemStack(TT_Container_Casings.sHintCasingsTT, 1, i), 32, 120);
+        }
+
+        //Scrench
+        GT_ModHandler.addCraftingRecipe(new ItemStack(FrontRotationTriggerItem.INSTANCE,1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"fPR", " RP", "S h",
+                        'P', OrePrefixes.plate.get(Materials.Cobalt),
+                        'R', OrePrefixes.stick.get(Materials.Cobalt),
+                        'S', OrePrefixes.stick.get(Materials.Wood),});
+
+        //BLUEprint
+        /*GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
+        */
+        //GT EU reader
+        GT_ModHandler.addCraftingRecipe(new ItemStack(EuMeterGT.INSTANCE,1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"PGW", "SCW", "BRN",
+                        'P', OrePrefixes.plateDouble.get(Materials.Steel),
+                        'G', OrePrefixes.plate.get(Materials.Glass),
+                        'W', OrePrefixes.cableGt01.get(Materials.Copper),
+                        'S', OrePrefixes.stick.get(Materials.Brass),
+                        'C', ItemList.Casing_Coil_Cupronickel.get(1),
+                        'B', Dyes.dyeBlue,
+                        'R', Dyes.dyeRed,
+                        'N', Dyes.dyeBlack,});
+
+        //Owner detector
+        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_OwnerDetector.get(1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"PPP","GEG","PPP",
+                        'P', OrePrefixes.plate.get(Materials.IronMagnetic),
+                        'G', OrePrefixes.plate.get(Materials.Glass),
+                        'E', OrePrefixes.gem.get(Materials.EnderPearl)});
+
+        //Data reader
+        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_DataReader.get(1),
+                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[]{"BdB","GES","PwP",
+                        'B', OrePrefixes.screw.get(Materials.Iridium),
+                        'P', OrePrefixes.plate.get(Materials.Iridium),
+                        'G', ItemList.Cover_Screen,
+                        'S', OrePrefixes.circuit.get(Materials.Elite),
+                        'E', ItemList.Hull_IV});
+
+        //Data Bank
+        RA.addAssemblylineRecipe(ItemList.Hatch_DataAccess_EV.get(1), 20000, new Object[]{
+                CustomItemList.Machine_Multi_Switch.get(1),
+                new Object[]{OrePrefixes.circuit.get(Materials.Master), 2},
+                ItemList.Tool_DataOrb.get(1),
+                ItemList.Cover_Screen.get(1),
+        }, new FluidStack[]{
+                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
+                Materials.Hydrogen.getGas(1000),
+        }, CustomItemList.Machine_Multi_DataBank.get(1), 12000, 14000);
+
+        //Bucks
+        //RA.addAssemblerRecipe(CustomItemList.)
+
+        //recipe for ass line data hatches
+        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataIn_Hatch.get(1), CustomItemList.dataInAss_Hatch.get(1), 2048, 12000);
+        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataOut_Hatch.get(1), CustomItemList.dataOutAss_Hatch.get(1), 2048, 12000);
+
+        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
+            new DreamCraftRecipeLoader().run(transformationInfo);//init recipes for GTNH version
+        } else if (Loader.isModLoaded(Reference.SPARTAKCORE)) {
+        	new SpartakCoreRecipeLoader().run(transformationInfo);//init recipes for SpartakCore version
+        } else {
+            new BloodyRecipeLoader().run(transformationInfo);//init recipes for NON-GTNH version
+        }
+    }
+}
+
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
index 7b8cc14f4d..a57f268d4e 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/BloodyRecipeLoader.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.loader.recipe;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.recipe.TT_recipeAdder;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -22,9 +23,8 @@ import net.minecraftforge.fluids.FluidStack;
 /**
  * Created by Tec on 06.08.2017.
  */
-public class BloodyRecipeLoader implements Runnable {
-    @Override
-    public void run() {
+public class BloodyRecipeLoader {
+    public void run(EMTransformationRegistry transformationInfo) {
         //Quantum Glass
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 CustomItemList.eM_Containment.get(1),
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
deleted file mode 100644
index 2a572d87de..0000000000
--- a/src/main/java/com/github/technus/tectech/loader/recipe/RecipeLoader.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.github.technus.tectech.loader.recipe;
-
-import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.compatibility.dreamcraft.DreamCraftRecipeLoader;
-import com.github.technus.tectech.compatibility.spartakcore.SpartakCoreRecipeLoader;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
-import com.github.technus.tectech.thing.CustomItemList;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
-import com.github.technus.tectech.thing.item.EuMeterGT;
-import com.github.technus.tectech.thing.item.FrontRotationTriggerItem;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Dyes;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-
-import static gregtech.api.enums.GT_Values.RA;
-
-/**
- * Created by danie_000 on 16.11.2016.
- */
-public class RecipeLoader implements Runnable {
-    public static Materials getOrDefault(String name,Materials def){
-        Materials mat=Materials.get(name);
-        return mat == Materials._NULL || mat == null ? def : mat;
-    }
-
-    @Override
-    public void run() {
-        EMAtomDefinition.setTransformations();
-        EMHadronDefinition.setTransformations();
-
-        // ===================================================================================================
-        // Recipes init - common goes here rest goes into methods below
-        // ===================================================================================================
-
-        for(int i=0;i<=15;i++) {
-            RA.addAssemblerRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(i), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1)}, Materials.Aluminium.getMolten(864), new ItemStack(TT_Container_Casings.sHintCasingsTT, 1, i), 32, 120);
-        }
-
-        //Scrench
-        GT_ModHandler.addCraftingRecipe(new ItemStack(FrontRotationTriggerItem.INSTANCE,1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"fPR", " RP", "S h",
-                        'P', OrePrefixes.plate.get(Materials.Cobalt),
-                        'R', OrePrefixes.stick.get(Materials.Cobalt),
-                        'S', OrePrefixes.stick.get(Materials.Wood),});
-
-        //BLUEprint
-        /*GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
-        */
-        //GT EU reader
-        GT_ModHandler.addCraftingRecipe(new ItemStack(EuMeterGT.INSTANCE,1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"PGW", "SCW", "BRN",
-                        'P', OrePrefixes.plateDouble.get(Materials.Steel),
-                        'G', OrePrefixes.plate.get(Materials.Glass),
-                        'W', OrePrefixes.cableGt01.get(Materials.Copper),
-                        'S', OrePrefixes.stick.get(Materials.Brass),
-                        'C', ItemList.Casing_Coil_Cupronickel.get(1),
-                        'B', Dyes.dyeBlue,
-                        'R', Dyes.dyeRed,
-                        'N', Dyes.dyeBlack,});
-
-        //Owner detector
-        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_OwnerDetector.get(1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"PPP","GEG","PPP",
-                        'P', OrePrefixes.plate.get(Materials.IronMagnetic),
-                        'G', OrePrefixes.plate.get(Materials.Glass),
-                        'E', OrePrefixes.gem.get(Materials.EnderPearl)});
-
-        //Data reader
-        GT_ModHandler.addCraftingRecipe(CustomItemList.Machine_DataReader.get(1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"BdB","GES","PwP",
-                        'B', OrePrefixes.screw.get(Materials.Iridium),
-                        'P', OrePrefixes.plate.get(Materials.Iridium),
-                        'G', ItemList.Cover_Screen,
-                        'S', OrePrefixes.circuit.get(Materials.Elite),
-                        'E', ItemList.Hull_IV});
-
-        //Data Bank
-        RA.addAssemblylineRecipe(ItemList.Hatch_DataAccess_EV.get(1), 20000, new Object[]{
-                CustomItemList.Machine_Multi_Switch.get(1),
-                new Object[]{OrePrefixes.circuit.get(Materials.Master), 2},
-                ItemList.Tool_DataOrb.get(1),
-                ItemList.Cover_Screen.get(1),
-        }, new FluidStack[]{
-                new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
-                Materials.Hydrogen.getGas(1000),
-        }, CustomItemList.Machine_Multi_DataBank.get(1), 12000, 14000);
-
-        //Bucks
-        //RA.addAssemblerRecipe(CustomItemList.)
-
-        //recipe for ass line data hatches
-        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataIn_Hatch.get(1), CustomItemList.dataInAss_Hatch.get(1), 2048, 12000);
-        RA.addAssemblerRecipe(ItemList.Hatch_DataAccess_EV.get(1), CustomItemList.dataOut_Hatch.get(1), CustomItemList.dataOutAss_Hatch.get(1), 2048, 12000);
-
-        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
-            new DreamCraftRecipeLoader().run();//init recipes for GTNH version
-        } else if (Loader.isModLoaded(Reference.SPARTAKCORE)) {
-        	new SpartakCoreRecipeLoader().run();//init recipes for SpartakCore version
-        } else {
-            new BloodyRecipeLoader().run();//init recipes for NON-GTNH version
-        }
-    }
-}
-
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index b3df7483f5..4dd9d3422d 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -6,6 +6,7 @@ import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_essentiaQuantizer;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.*;
+import com.github.technus.tectech.thing.metaTileEntity.multi.em_collider.GT_MetaTileEntity_EM_collider;
 import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM;
@@ -15,7 +16,7 @@ import cpw.mods.fml.common.Loader;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.CustomItemList.*;
 
@@ -74,22 +75,22 @@ public class MachineLoader implements Runnable {
         // ===================================================================================================
 
         eM_muffler_UV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15020, "hatch.emmuffler.tier.08", "UV Overflow Output Hatch", 8, 1e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UHV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15021, "hatch.emmuffler.tier.09", "UHV Overflow Output Hatch", 9, 5e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UEV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15022, "hatch.emmuffler.tier.10", "UEV Overflow Output Hatch", 10, 25e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UIV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15023, "hatch.emmuffler.tier.11", "UIV Overflow Output Hatch", 11, 125e10f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UMV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15024, "hatch.emmuffler.tier.12", "UMV Overflow Output Hatch", 12, 125e11f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         eM_muffler_UXV.set(new GT_MetaTileEntity_Hatch_OverflowElemental(
-                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f*AVOGADRO_CONSTANT).getStackForm(1L));
+                15025, "hatch.emmuffler.tier.13", "UXV Overflow Output Hatch", 13, 125e12f* EM_COUNT_PER_MATERIAL_AMOUNT).getStackForm(1L));
 
         
         // ===================================================================================================
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index c6ac34b66d..84f8a5e9d6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -31,18 +31,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
-    private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * AVOGADRO_CONSTANT_144;//can be const as it is computed later...
+    private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;//can be const as it is computed later...
     private static final int COUNT_DIV=32;
     private static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
     private static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge";
     private static final int MEAN_DELAY =50;
-    private static final double CANCER_EFFECTIVENESS = 1/AVOGADRO_CONSTANT;
-    private static final double CHARGE_EFFECTIVENESS = 10/AVOGADRO_CONSTANT;
-    private static final double CHARGE_EXPLOSIVENESS = 5/AVOGADRO_CONSTANT;
+    private static final double CANCER_EFFECTIVENESS = 1/ EM_COUNT_PER_MATERIAL_AMOUNT;
+    private static final double CHARGE_EFFECTIVENESS = 10/ EM_COUNT_PER_MATERIAL_AMOUNT;
+    private static final double CHARGE_EXPLOSIVENESS = 5/ EM_COUNT_PER_MATERIAL_AMOUNT;
 
     private boolean fixMe=false;
     private final ArrayList<EntityPlayer> playersWithCharge = new ArrayList<>();
@@ -133,7 +133,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     }
 
     private void swapSomething(Chunk a,Chunk b,double mass) {
-        float explosionPower=(float) Math.log(mass/AVOGADRO_CONSTANT);
+        float explosionPower=(float) Math.log(mass/ EM_COUNT_PER_MATERIAL_AMOUNT);
         for (int i = 0; i < Math.min((int)explosionPower,64); i++) {
             int x = TecTech.RANDOM.nextInt(16);
             int y = TecTech.RANDOM.nextInt(a.worldObj.getActualHeight());
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
index e00e72446d..d607dfad73 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/EMException.java
@@ -19,7 +19,4 @@ public final class EMException extends RuntimeException {
     public EMException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
         super(message, cause, enableSuppression, writableStackTrace);
     }
-
-    public EMException() {
-    }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
index af4caf854b..18f2f76498 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -1,36 +1,31 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.thing.item.DebugElementalInstanceContainer_EM;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
 
 /**
  * Created by danie_000 on 30.12.2017.
  */
 public class EMGive implements ICommand {
-    ArrayList<String> aliases=new ArrayList<>();
+    ArrayList<String> aliases = new ArrayList<>();
 
-    public EMGive(){
+    public EMGive() {
         aliases.add("em_give");
         aliases.add("give_em");
         aliases.add("gib_em");
@@ -39,27 +34,24 @@ public class EMGive implements ICommand {
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
         if (sender instanceof EntityPlayerMP && !sender.getEntityWorld().isRemote) {
-            if(args.length < 3) {
+            if (args.length < 3) {
                 sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
-            }else{
-                TecTech.LOGGER.info("Spawninig EM for "+((EntityPlayerMP) sender).getDisplayName()+" - "+Arrays.toString(args));
+            } else {
+                TecTech.LOGGER.info("Spawninig EM for " + ((EntityPlayerMP) sender).getDisplayName() + " - " + Arrays.toString(args));
 
-                ArrayList<String> list = new ArrayList<>(Arrays.asList(args));
-                String energy=list.remove(0);
+                ArrayList<String> list   = new ArrayList<>(Arrays.asList(args));
+                String            energy = list.remove(0);
 
-                EMDefinitionStack def = getDefinitionStack(list);
-                if(def!=null) {
-                    EMInstanceStack instanceStack = new EMInstanceStack(def, 1D, 0D, Long.parseLong(energy));
+                EMDefinitionStack def = getDefinitionStack(TecTech.definitionsRegistry, list);
+                if (def != null) {
+                    EMInstanceStack instanceStack = new EMInstanceStack(def, 1, 0, Long.parseLong(energy));
 
                     sender.addChatMessage(new ChatComponentText(instanceStack.getDefinition().getSymbol() + " - " + instanceStack.getDefinition().getLocalizedName()));
 
                     EMInstanceStackMap instanceMap = new EMInstanceStackMap(instanceStack);
 
                     ItemStack itemStack = new ItemStack(DebugElementalInstanceContainer_EM.INSTANCE);
-                    NBTTagCompound contents = new NBTTagCompound();
-                    contents.setTag("info", instanceMap.getInfoNBT());
-                    contents.setTag("content", instanceMap.toNBT());
-                    itemStack.setTagCompound(contents);
+                    DebugElementalInstanceContainer_EM.INSTANCE.setContent(itemStack, instanceMap);
 
                     ((EntityPlayerMP) sender).inventory.addItemStackToInventory(itemStack);
                 }
@@ -67,40 +59,45 @@ public class EMGive implements ICommand {
         }
     }
 
-    private EMDefinitionStack getDefinitionStack(ArrayList<String> args){
-        if(args.get(0).equals("<")){
-            args.remove(0);
+    private EMDefinitionStack getDefinitionStack(EMDefinitionsRegistry registry, ArrayList<String> args) {
+        double amount;
+        if (args.size() == 0) {
             return null;
         }
-        double amount=Double.parseDouble(args.remove(0));
-        try{
-            int id=Integer.parseInt(args.get(0));
-            args.remove(0);
-            IEMDefinition primitive = IEMDefinition.getBindsPrimitive().get(id);
-            return new EMDefinitionStack(primitive,amount);
-        }catch (NumberFormatException e){
-            byte clazz = (byte) args.remove(0).charAt(0);
-            Method constructor = IEMDefinition.getBindsComplex().get(clazz);
-
-            EMDefinitionStackMap stacks =new EMDefinitionStackMap();
-            while(args.size()>0){
-                EMDefinitionStack tempStack =getDefinitionStack(args);
-                if(tempStack==null) {
-                    break;
-                }else {
-                    stacks.putUnifyExact(tempStack);
-                }
+        String defTag = args.remove(0);
+        if ("<".equals(defTag)) {
+            return null;
+        }
+        try {
+            amount = Double.parseDouble(defTag);
+            if (args.size() == 0) {
+                return null;
             }
-
-            try {
-                return ((IEMDefinition) constructor.invoke(null, stacks.toNBT())).getStackForm(amount);
-            } catch (Exception e1) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
+            defTag = args.remove(0);
+            if ("<".equals(defTag)) {
+                return null;
+            }
+        } catch (Exception e) {
+            amount = 1;
+        }
+        IEMDefinition definition = registry.getDirectBinds().get(defTag);
+        if (definition != null) {
+            return definition.getStackForm(amount);
+        }
+        EMIndirectType emIndirectType = registry.getIndirectBinds().get(defTag);
+        if (emIndirectType != null) {
+            EMDefinitionStackMap stacks = new EMDefinitionStackMap();
+            while (args.size() > 0) {
+                EMDefinitionStack definitionStack = getDefinitionStack(registry, args);
+                if (definitionStack == null) {
+                    break;
+                } else {
+                    stacks.putUnifyExact(definitionStack);
                 }
-                return nbtE__.getStackForm(amount);
             }
+            return emIndirectType.create(registry, stacks.toNBT(registry)).getStackForm(amount);
         }
+        return null;
     }
 
     @Override
@@ -120,33 +117,20 @@ public class EMGive implements ICommand {
 
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==2){
-            return completionsForClassOrID();
+        if (args.length > 1 && args.length % 2 == 0) {
+            return new ArrayList<>(TecTech.definitionsRegistry.getBinds().keySet());
         }
         return null;
     }
 
-    private List<String> completionsForClassOrID(){
-        ArrayList<String> strings=new ArrayList<>(8);
-        Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
-        for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-            strings.add(String.valueOf((char)e.getKey().byteValue()));
-        }
-        Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
-        for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
-            strings.add(String.valueOf(e.getKey().byteValue()));
-        }
-        return strings;
-    }
-
     @Override
     public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_give Energy Count ClassOrId (Count ClassOrId ... <)";
+        return "em_give Energy Count ClassOrId ( (Count ClassOrId ... <) ...<)";
     }
 
     @Override
     public int compareTo(Object o) {
-        if(o instanceof ICommand){
+        if (o instanceof ICommand) {
             return getCommandName().compareTo(((ICommand) o).getCommandName());
         }
         return 0;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
index 13531dbf85..90eddf1e23 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -1,15 +1,15 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
+import com.github.technus.tectech.util.Util;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * Created by danie_000 on 30.12.2017.
@@ -26,27 +26,32 @@ public class EMList implements ICommand {
     public void processCommand(ICommandSender sender, String[] args) {
         if (!sender.getEntityWorld().isRemote) {
             if(args.length == 0) {
-                sender.addChatMessage(new ChatComponentText("    Available Classes: tag - name"));
-                Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
-                for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                    sender.addChatMessage(new ChatComponentText((char) e.getKey().byteValue() +" - "+e.getValue().getReturnType().getSimpleName()));
-                }
-            }else if(args.length==1){
-                sender.addChatMessage(new ChatComponentText("    Available Primitives: symbol - name"));
-                if(args[0].equals(String.valueOf((char) EMPrimitiveTemplate.nbtType))){
-                    Map<Integer, EMPrimitiveTemplate> bindsBO = IEMDefinition.getBindsPrimitive();
-                    for (Map.Entry<Integer, EMPrimitiveTemplate> e:bindsBO.entrySet()) {
-                        sender.addChatMessage(new ChatComponentText(e.getKey() + " - "+e.getValue().getLocalizedName()));
-                    }
-                }else{
-                    sender.addChatMessage(new ChatComponentText("Complex definition - needs contents"));
-                }
-            }else{
-                sender.addChatMessage(new ChatComponentText(getCommandUsage(sender)));
+                listClasses(sender);
+            }else {
+                listDefinitions(sender, Util.getConcated(args," "));
             }
         }
     }
 
+    private void listDefinitions(ICommandSender sender, String arg) {
+        sender.addChatMessage(new ChatComponentText("    Available Direct: tag - name symbol"));
+        for (EMType directType : TecTech.definitionsRegistry.getDirectTypes().values()) {
+            if ("*".equals(arg) || arg.equalsIgnoreCase(directType.getLocalizedName())) {
+                directType.getDefinitions().forEach((bind, definition) ->
+                        sender.addChatMessage(new ChatComponentText(bind + " - " + definition.getLocalizedName() + " " + definition.getSymbol())));
+            }
+        }
+    }
+
+    private void listClasses(ICommandSender sender) {
+        sender.addChatMessage(new ChatComponentText("    Available Direct: name (use name as parameter to learn more"));
+        TecTech.definitionsRegistry.getDirectTypes().forEach((aClass, emDirectType) ->
+                sender.addChatMessage(new ChatComponentText(emDirectType.getLocalizedName())));
+        sender.addChatMessage(new ChatComponentText("    Available Indirect: tag - name"));
+        TecTech.definitionsRegistry.getIndirectBinds().forEach((bind, emIndirectType) ->
+                sender.addChatMessage(new ChatComponentText(bind+" - "+emIndirectType.getLocalizedName())));
+    }
+
     @Override
     public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
         return false;
@@ -65,19 +70,14 @@ public class EMList implements ICommand {
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
         if(args.length==0){
-            Map<Byte,Method> binds= IEMDefinition.getBindsComplex();
-            ArrayList<String> strings=new ArrayList<>(binds.size());
-            for (Map.Entry<Byte,Method> e:binds.entrySet()) {
-                strings.add(String.valueOf((char)e.getKey().byteValue())+' '+e.getValue().getReturnType().getSimpleName());
-            }
-            return strings;
+            return TecTech.definitionsRegistry.getDirectTypes().values().stream().map(EMType::getLocalizedName).collect(Collectors.toList());
         }
         return null;
     }
 
     @Override
     public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "em_list (optional class tag)";
+        return "em_list (optional Direct Name or *)";
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
index 94a50ce322..13838cf443 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMComplexTemplate.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -29,11 +30,6 @@ public abstract class EMComplexTemplate implements IEMDefinition {
         return getSubParticles().compareWithAmountsInternal(o.getSubParticles());
     }
 
-    @Override
-    public final EMDefinitionStack getStackForm(double amount) {
-        return new EMDefinitionStack(this, amount);
-    }
-
     @Override
     public final boolean equals(Object obj) {
         if(this==obj) {
@@ -50,24 +46,22 @@ public abstract class EMComplexTemplate implements IEMDefinition {
 
     @Override
     public int hashCode() {//Internal amounts should be also hashed
-        int hash = -(getSubParticles().size() << 4);
+        int hash = -(getSubParticles().size() << 16);
         for (EMDefinitionStack stack : getSubParticles().valuesToArray()) {
             int amount=(int) stack.getAmount();
-            hash += ((amount & 0x1) == 0 ? -amount : amount) + stack.getDefinition().hashCode();
+            hash += ((amount & 0x1) == 0 ? -amount : amount) * (stack.getDefinition().hashCode()<<4);
         }
         return hash;
     }
 
     @Override
     public String toString() {
-        return getLocalizedName()+ '\n' + getSymbol();
+        return getLocalizedName()+ " " + getSymbol();
     }
 
-    public NBTTagCompound toNBT() {
-        NBTTagCompound nbtTagCompound = getSubParticles().toNBT();
-        nbtTagCompound.setInteger(EMDefinitionsRegistry.getIndirectTagName(), getIndirectTagValue());
-        return nbtTagCompound;
+    public NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
+        return registry.indirectToNBT(getIndirectTagValue(),getSubParticles());
     }
 
-    protected abstract int getIndirectTagValue();
+    protected abstract String getIndirectTagValue();
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
deleted file mode 100644
index c0f9df32f2..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMDefinitionsRegistry.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.*;
-import java.util.function.Function;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
-
-public class EMDefinitionsRegistry {
-    private static final NavigableSet<IEMDefinition>                                     STACKS_REGISTERED = new TreeSet<>();
-    private static final Map<Integer, IEMDefinition>                                     DIRECT_BINDS      = new HashMap<>();
-    private static final Map<Integer, Function<NBTTagCompound, ? extends IEMDefinition>> CLASS_BINDS       = new HashMap<>();//creator methods in subclasses
-    private static final Map<Integer, Class<? extends IEMDefinition>>                    CLASSES           = new HashMap<>();
-    private static final Map<Class<? extends IEMDefinition>, Integer>                    CLASS_TYPES       = new HashMap<>();
-    private static final String                                                          INDIRECT_TAG      = "t";
-    private static final String                                                          DIRECT_TAG        = "c";
-
-    private EMDefinitionsRegistry() {
-    }
-
-    static {
-        CLASS_BINDS.put(0, EMDefinitionsRegistry::getDefinitionDirect);
-        CLASS_BINDS.put((int) 'p', EMDefinitionsRegistry::getDefinitionDirect);
-    }
-
-    private static IEMDefinition getDefinitionDirect(NBTTagCompound nbt) {
-        return DIRECT_BINDS.get(nbt.getInteger(getDirectTagName()));
-    }
-
-    public static IEMDefinition fromNBT(NBTTagCompound nbt) {
-        IEMDefinition apply;
-        try {
-            apply = CLASS_BINDS.get(nbt.getInteger(getIndirectTagName())).apply(nbt);
-        } catch (Exception e) {
-            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
-            if (DEBUG_MODE) {
-                emException.printStackTrace();
-                return nbtE__;
-            } else {
-                throw emException;
-            }
-        }
-        if (!DEBUG_MODE) {
-            if (apply == nbtE__) {
-                throw new EMException("Deserialized to NBT ERROR!");
-            } else if (apply == null__ || apply == null) {
-                throw new EMException("Deserialized to NULL POINTER!");
-            }
-        }
-        if (apply == null) {
-            return null__;
-        }
-        return apply;
-    }
-
-    public static <T extends IEMDefinition> void registerDefinitionClass(int shortcutNBT, Function<NBTTagCompound, T> creator, Class<T> clazz, int classID) {
-        if (CLASS_BINDS.put(shortcutNBT, creator) != null) {
-            EMException e = new EMException("Duplicate NBT shortcut! " + shortcutNBT + " used for NBT based creation");
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            } else {
-                throw e;
-            }
-        }
-        if (CLASSES.put(classID, clazz) != null) {
-            EMException e = new EMException("Duplicate Class ID! " + classID + " used for class comparison");
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            } else {
-                throw e;
-            }
-        }
-        CLASS_TYPES.put(clazz, classID);
-    }
-
-    public static void registerDirectDefinition(IEMDefinition definition, int id) {
-        IEMDefinition old = DIRECT_BINDS.put(id, definition);
-        if (old != null) {
-            EMException e = new EMException("Duplicate primitive EM ID: " + id +
-                    " for " + definition.getLocalizedName() +
-                    " and " + old.getLocalizedName());
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            } else {
-                throw e;
-            }
-        }
-    }
-
-    public static NavigableSet<IEMDefinition> getStacksRegisteredForDisplay() {
-        return STACKS_REGISTERED;
-    }
-
-    public static void registerForDisplay(IEMDefinition definition){
-        STACKS_REGISTERED.add(definition);
-        STACKS_REGISTERED.add(definition.getAnti());
-    }
-
-    public static String getIndirectTagName() {
-        return INDIRECT_TAG;
-    }
-
-    public static String getDirectTagName() {
-        return DIRECT_TAG;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index b529b79cc0..0f25d73704 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -2,10 +2,8 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.ArrayList;
@@ -25,41 +23,43 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     //int -electric charge in 1/3rds of electron charge for optimization
     private final int    charge;
     //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private final byte   color;
+    private final int color;
     //-1/-2/-3 anti matter generations, +1/+2/+3 matter generations, 0 self anti
-    private final byte type;
+    private final int generation;
 
-    private EMPrimitiveTemplate anti;//IMMUTABLE
+    private IEMDefinition anti;//IMMUTABLE
     private EMDecay[]           elementalDecays;
     private byte                naturalDecayInstant;
     private byte energeticDecayInstant;
     private double rawLifeTime;
 
     private final int ID;
+    private final String bind;
 
     //no _ at end - normal particle
     //   _ at end - anti particle
     //  __ at end - self is antiparticle
 
-    protected EMPrimitiveTemplate(String name, String symbol, int type, double mass, int charge, int color, int ID) {
+    protected EMPrimitiveTemplate(String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) {
         this.name = name;
         this.symbol = symbol;
-        this.type = (byte) type;
+        this.generation = generation;
         this.mass = mass;
         this.charge = charge;
-        this.color = (byte) color;
+        this.color = color;
         this.ID = ID;
-        EMDefinitionsRegistry.registerDirectDefinition(this,ID);
+        this.bind=bind;
     }
 
     //
-    protected void init(EMPrimitiveTemplate antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
+    protected void init(EMDefinitionsRegistry registry,IEMDefinition antiParticle, double rawLifeTime, int naturalInstant, int energeticInstant, EMDecay... elementalDecaysArray) {
         anti = antiParticle;
         this.rawLifeTime = rawLifeTime;
         naturalDecayInstant = (byte) naturalInstant;
         energeticDecayInstant = (byte) energeticInstant;
         elementalDecays =elementalDecaysArray;
-        EMDefinitionsRegistry.registerForDisplay(this);
+        registry.registerForDisplay(this);
+        registry.registerDirectDefinition(bind,this);
     }
 
     @Override
@@ -83,7 +83,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return color;
     }
 
@@ -153,44 +153,27 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     }
 
     @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    public byte getMatterType() {
-        return type;
+    public int getGeneration() {
+        return generation;
     }
 
     @Override
-    public final NBTTagCompound toNBT() {
-        NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setInteger(EMDefinitionsRegistry.getDirectTagName(), ID);
-        return nbt;
+    public final NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
+        return registry.directToNBT(bind);
     }
 
     @Override
-    protected final int getIndirectTagValue() {
+    protected final String getIndirectTagValue() {
         throw new EMException("This class should only be used directly!");
     }
 
     @Override
-    public final byte getClassType() {
+    public final int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic(){
-        return -128;
+    public static int getClassTypeStatic(){
+        return Short.MIN_VALUE;
     }
 
     @Override
@@ -203,7 +186,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
         if(areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + EMDefinitionsRegistry.getDirectTagName() + ' ' + getClassType());
+            lines.add("DIRECT = " + bind + ' ' + getMatterMassType());
         }
         if(areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = "+ getLocalizedName());
@@ -213,7 +196,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
         if(areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+            lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
         if(areBitsSet(SCAN_GET_MASS,capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
@@ -226,7 +209,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
 
     @Override
     public final int compareTo(IEMDefinition o) {
-        if (getClassType() == o.getClassType()) {
+        if (getMatterMassType() == o.getMatterMassType()) {
             int oID = ((EMPrimitiveTemplate) o).ID;
             return Integer.compare(ID, oID);
         }
@@ -238,7 +221,7 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         return ID;
     }
 
-    public String getName() {
+    public String getUnlocalizedName() {
         return name;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
index 06bfc61737..8125812dc6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
@@ -1,11 +1,9 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.definitions;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.ArrayList;
@@ -31,9 +29,9 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
 
     void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
 
-    byte getMatterType();
+    int getMatterMassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
 
-    byte getClassType();//bigger number means bigger things usually, but it is just used to differentiate between classes of iED
+    int getGeneration();
 
     //Not dynamically changing stuff
     IEMDefinition getAnti();//gives new anti particle def
@@ -59,7 +57,11 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
     int getCharge();//charge 1/3 electron charge
 
     //dynamically changing stuff
-    byte getColor();//-1 nope cannot 0 it can but undefined
+    int getMaxColors();
+
+    default boolean hasColor(){
+        return getMaxColors()>0;
+    }
 
     double getRawTimeSpan(long currentEnergy);//defined in static fields or generated
 
@@ -67,19 +69,17 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
 
     EMConstantStackMap getSubParticles();//contents... null if none
 
-    EMFluidDequantizationInfo someAmountIntoFluidStack();
-
-    EMItemDequantizationInfo someAmountIntoItemsStack();
-
-    EMOredictDequantizationInfo someAmountIntoOredictStack();
+    NBTTagCompound toNBT(EMDefinitionsRegistry registry);
 
-    NBTTagCompound toNBT();
-
-    EMDefinitionStack getStackForm(double amount);
+    default EMDefinitionStack getStackForm(double amount){
+        return new EMDefinitionStack(this,amount);
+    }
 
-    IEMDefinition clone();
+    default IEMDefinition clone(){
+        return this;
+    }
 
     default int compareClassID(IEMDefinition obj) {
-        return (int) getClassType() - obj.getClassType();
+        return getMatterMassType() - obj.getMatterMassType();
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java
new file mode 100644
index 0000000000..458965da66
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMDefinitionsRegistry.java
@@ -0,0 +1,189 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.*;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
+
+public class EMDefinitionsRegistry {
+    private static final String TAG_NAME = "EM";
+
+    private final NavigableSet<IEMDefinition> stacksRegistered = new TreeSet<>();
+
+    private final Map<Integer, IEMDefinition> hashMap  = new HashMap<>();
+    private final Map<Integer, IEMDefinition> hashMapR = Collections.unmodifiableMap(hashMap);
+
+    private final Map<Class<? extends IEMDefinition>, EMType>         types          = new HashMap<>();
+    private final Map<Class<? extends IEMDefinition>, EMType>         typesR         = Collections.unmodifiableMap(types);
+    private final Map<Class<? extends IEMDefinition>, EMType>         directTypes    = new HashMap<>();
+    private final Map<Class<? extends IEMDefinition>, EMType>         directTypesR   = Collections.unmodifiableMap(directTypes);
+    private final Map<Class<? extends IEMDefinition>, EMIndirectType> indirectTypes  = new HashMap<>();
+    private final Map<Class<? extends IEMDefinition>, EMIndirectType> indirectTypesR = Collections.unmodifiableMap(indirectTypes);
+
+    private final Map<String, EMType>         binds          = new HashMap<>();
+    private final Map<String, EMType>         bindsR         = Collections.unmodifiableMap(binds);
+    private final Map<String, IEMDefinition>  directBinds    = new HashMap<>();
+    private final Map<String, IEMDefinition>  directBindsR   = Collections.unmodifiableMap(directBinds);
+    private final Map<String, EMIndirectType> indirectBinds  = new HashMap<>();
+    private final Map<String, EMIndirectType> indirectBindsR = Collections.unmodifiableMap(indirectBinds);
+
+    public NBTTagCompound directToNBT(String bind) {
+        NBTTagCompound nbt = new NBTTagCompound();
+        nbt.setString(TAG_NAME, bind);
+        return nbt;
+    }
+
+    public NBTTagCompound indirectToNBT(String bind, IEMMapRead<EMDefinitionStack> content) {
+        NBTTagCompound nbt = content.toNBT(this);
+        nbt.setString(TAG_NAME, bind);
+        return nbt;
+    }
+
+    public IEMDefinition fromNBT(NBTTagCompound nbt) {
+        IEMDefinition definition;
+        try {
+            String bind = nbt.getString(TAG_NAME);
+            definition = directBinds.get(bind);
+            if (definition == null) {
+                definition = indirectBinds.get(bind).create(this, nbt);
+            }
+        } catch (Exception e) {
+            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
+            if (DEBUG_MODE) {
+                emException.printStackTrace();
+                return nbtE__;
+            } else {
+                throw emException;
+            }
+        }
+        if (!DEBUG_MODE) {
+            if (definition == nbtE__) {
+                throw new EMException("Deserialized to NBT ERROR!");
+            } else if (definition == null) {
+                throw new EMException("Deserialized to NULL POINTER!");
+            } else if (definition == null__) {
+                throw new EMException("Deserialized to NULL!");
+            }
+        }
+        if (definition == null) {
+            return null__;
+        }
+        return definition;
+    }
+
+    public boolean isOccupied(String bind) {
+        return binds.containsKey(bind);
+    }
+
+    protected void addType(EMType emType) {
+        if (types.put(emType.getClazz(), emType) != null) {
+            EMException e = new EMException("Class collision! " + emType.getClazz().getName());
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    protected void bindType(String bind, EMType emType) {
+        if (binds.put(bind, emType) != null) {
+            EMException e = new EMException("NBT Bind collision! " + bind);
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    public void registerDefinitionClass(String bind, EMIndirectType emIndirectType) {
+        addType(emIndirectType);
+        indirectTypes.put(emIndirectType.getClazz(), emIndirectType);
+        bindType(bind, emIndirectType);
+        indirectBinds.put(bind, emIndirectType);
+    }
+
+    public void registerDefinitionClass(EMType emDirectType) {
+        addType(emDirectType);
+    }
+
+    public void registerDirectDefinition(String bind, IEMDefinition definition) {
+        if (hashMap.put(definition.hashCode(), definition) != null) {
+            EMException e = new EMException("Hash collision! " + definition.hashCode());
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+        EMType emType = directTypes.get(definition.getClass());
+        if (emType == null) {
+            emType = types.get(definition.getClass());
+            if (emType != null) {
+                directTypes.put(definition.getClass(), emType);
+            } else {
+                EMException e = new EMException("Direct Type bind missing! " + definition.getClass().getName());
+                if (DEBUG_MODE) {
+                    e.printStackTrace();
+                } else {
+                    throw e;
+                }
+            }
+        }
+        if (emType != null) {
+            directTypes.put(definition.getClass(), emType);
+            bindType(bind, emType);
+            emType.addDefinition(bind, definition);
+            directBinds.put(bind, definition);
+        }
+    }
+
+    public void registerForDisplay(IEMDefinition definition) {
+        stacksRegistered.add(definition);
+        IEMDefinition anti = definition.getAnti();
+        if (anti != null) {
+            stacksRegistered.add(anti);
+        }
+    }
+
+    @Deprecated
+    public Map<Integer, IEMDefinition> getHashMapping() {
+        return hashMapR;
+    }
+
+    public NavigableSet<IEMDefinition> getStacksRegisteredForDisplay() {
+        return stacksRegistered;
+    }
+
+    public Map<String, EMType> getBinds() {
+        return bindsR;
+    }
+
+    public Map<String, IEMDefinition> getDirectBinds() {
+        return directBindsR;
+    }
+
+    public Map<String, EMIndirectType> getIndirectBinds() {
+        return indirectBindsR;
+    }
+
+    public Map<Class<? extends IEMDefinition>, EMType> getTypes() {
+        return typesR;
+    }
+
+    public Map<Class<? extends IEMDefinition>, EMType> getDirectTypes() {
+        return directTypesR;
+    }
+
+    public Map<Class<? extends IEMDefinition>, EMIndirectType> getIndirectTypes() {
+        return indirectTypesR;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java
new file mode 100644
index 0000000000..680dd029a4
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMIndirectType.java
@@ -0,0 +1,37 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import net.minecraft.nbt.NBTTagCompound;
+
+import java.util.function.BiFunction;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
+
+public class EMIndirectType extends EMType {
+    private final BiFunction<EMDefinitionsRegistry, NBTTagCompound, IEMDefinition> creator;
+
+    public EMIndirectType(BiFunction<EMDefinitionsRegistry, NBTTagCompound, IEMDefinition> creator, Class<? extends IEMDefinition> clazz, String unlocalizedName) {
+        super(clazz, unlocalizedName);
+        this.creator = creator;
+    }
+
+    protected BiFunction<EMDefinitionsRegistry,NBTTagCompound, IEMDefinition> getCreator() {
+        return creator;
+    }
+
+    public IEMDefinition create(EMDefinitionsRegistry registry,NBTTagCompound nbt){
+        try {
+            return creator.apply(registry, nbt);
+        }catch (Exception e){
+            EMException emException = new EMException("Failed to create from: " + nbt.toString(), e);
+            if (DEBUG_MODE) {
+                emException.printStackTrace();
+                return nbtE__;
+            } else {
+                throw emException;
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java
new file mode 100644
index 0000000000..73097db663
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/registry/EMType.java
@@ -0,0 +1,63 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+public class EMType {
+    private final Map<String, IEMDefinition> definitions  = new HashMap<>();
+    private final Map<String, IEMDefinition> definitionsR = Collections.unmodifiableMap(definitions);
+    private final Class<? extends IEMDefinition>                   clazz;
+    private final String                     unlocalizedName;
+
+    public EMType(Class<? extends IEMDefinition> clazz, String unlocalizedName) {
+        this.clazz = clazz;
+        this.unlocalizedName = unlocalizedName;
+    }
+
+    public Class<? extends IEMDefinition> getClazz() {
+        return clazz;
+    }
+
+    public String getUnlocalizedName() {
+        return unlocalizedName;
+    }
+
+    public String getLocalizedName() {
+        return translateToLocal(getUnlocalizedName());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        return clazz==((EMType) o).clazz;
+    }
+
+    @Override
+    public int hashCode() {
+        return clazz.hashCode();
+    }
+
+    public void addDefinition(String bind, IEMDefinition definition) {
+        if (definitions.put(bind, definition) != null) {
+            EMException e = new EMException("NBT Bind collision on Direct bind!");
+            if (DEBUG_MODE) {
+                e.printStackTrace();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    public Map<String, IEMDefinition> getDefinitions() {
+        return definitionsR;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
index e6cfa7d03e..f6bef9910e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMConstantStackMap.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
@@ -45,10 +46,10 @@ public final class EMConstantStackMap/*IMMUTABLE*/ extends EMStackMap<EMDefiniti
         return new EMDefinitionStackMap(new TreeMap<>(getBackingMap()));
     }
 
-    public static EMConstantStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+    public static EMConstantStackMap fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) throws EMException {
         EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
         for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            defStacks[i] = EMDefinitionStack.fromNBT(registry,nbt.getCompoundTag(Integer.toString(i)));
             if (defStacks[i].getDefinition().equals(nbtE__)) {
                 throw new EMException("Something went Wrong");
             }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
index 78bb8d740a..57b8f7bf1c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMDefinitionStackMap.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
@@ -43,10 +44,10 @@ public final class EMDefinitionStackMap extends EMStackMap<EMDefinitionStack> im
         return new EMConstantStackMap(getBackingMap());
     }
 
-    public static EMDefinitionStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+    public static EMDefinitionStackMap fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) throws EMException {
         EMDefinitionStack[] defStacks = new EMDefinitionStack[nbt.getInteger("i")];
         for (int i = 0; i < defStacks.length; i++) {
-            defStacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            defStacks[i] = EMDefinitionStack.fromNBT(registry,nbt.getCompoundTag(Integer.toString(i)));
             if (defStacks[i].getDefinition().equals(nbtE__)) {
                 throw new EMException("Something went Wrong");
             }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
index 69dc53f83d..64ff7063e8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -1,10 +1,12 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
@@ -13,9 +15,10 @@ import java.util.Map;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.AVOGADRO_CONSTANT;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
 import static com.github.technus.tectech.util.DoubleCount.add;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.01.2017.
@@ -91,7 +94,7 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         for (EMInstanceStack instance : getBackingMap().values()) {
             info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName()+
                     " "+ EnumChatFormatting.AQUA + instance.getDefinition().getSymbol()+ EnumChatFormatting.RESET+
-                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E", instance.getAmount() / AVOGADRO_CONSTANT) +" mol"+ EnumChatFormatting.RESET+
+                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E", instance.getAmount() /AVOGADRO_CONSTANT) +" "+translateToLocal("tt.keyword.mol")+ EnumChatFormatting.RESET+
                     " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
                     " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
         }
@@ -120,16 +123,15 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
     }
 
     public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
-        cleanUp();
+        //cleanUp();
         double diff=0;
-        for (EMInstanceStack instance : valuesToArray()) {
+        for (EMInstanceStack instance : takeAllToArray()) {
             instance.setAge(instance.getAge() + seconds);
             EMDecayResult newInstances = instance.decay(lifeTimeMult, instance.getAge(), postEnergize);
             if (newInstances == null) {
-                instance.nextColor();
+                putUnify(instance);
             } else {
                 diff=add(diff,newInstances.getMassDiff());
-                removeAmount(instance);//todo check maybe this should be removeKey
                 putUnifyAll(newInstances.getOutput());
             }
         }
@@ -157,10 +159,10 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return nbt;
     }
 
-    public static EMInstanceStackMap fromNBT(NBTTagCompound nbt) throws EMException {
+    public static EMInstanceStackMap fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) throws EMException {
         EMInstanceStack[] instances = new EMInstanceStack[nbt.getInteger("i")];
         for (int i = 0; i < instances.length; i++) {
-            instances[i] = EMInstanceStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
+            instances[i] = EMInstanceStack.fromNBT(registry,nbt.getCompoundTag(Integer.toString(i)));
             if (instances[i].getDefinition().equals(nbtE__)) {
                 throw new EMException("Something went Wrong");
             }
@@ -188,6 +190,12 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return build.toString();
     }
 
+    public EMInstanceStack[] takeAllToArray(){
+        EMInstanceStack[] newStack = valuesToArray();//just in case to uncouple The map
+        this.getBackingMap().clear();
+        return newStack;
+    }
+
     public EMInstanceStackMap takeAll(){
         EMInstanceStackMap newStack =new EMInstanceStackMap(false,new TreeMap<>(this.getBackingMap()));//just in case to uncouple The map
         this.getBackingMap().clear();
@@ -212,7 +220,7 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
             return stack;
         }
         double newAmount = add(target.getAmount(), stack.getAmount());
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=target.unifyIntoThis(stack);
             putReplace(stack);
             return stack;
@@ -230,7 +238,7 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
             return stack;
         }
         double newAmount = target.getAmount()+stack.getAmount();
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=target.unifyIntoThis(stack);
             putReplace(stack);
             return stack;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
index 1322566914..c0420fa2b2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
@@ -9,18 +10,11 @@ import net.minecraft.util.EnumChatFormatting;
 import java.lang.reflect.Array;
 import java.util.*;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.*;
 import static com.github.technus.tectech.util.DoubleCount.ulpSigned;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>>, Cloneable {
-    static boolean isValidAmount(double amount){
-        return amount>=AVOGADRO_CONSTANT_UNCERTAINTY;
-    }
-
-    static boolean isInvalidAmount(double amount){
-        return amount<AVOGADRO_CONSTANT_UNCERTAINTY;
-    }
-
     NavigableMap<IEMDefinition,T> getBackingMap();
 
     IEMMapRead<T> clone();
@@ -105,7 +99,7 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         for (T defStack : values()) {
             info[i] = EnumChatFormatting.BLUE + defStack.getDefinition().getLocalizedName();
             info[i + 1] = EnumChatFormatting.AQUA + defStack.getDefinition().getSymbol();
-            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT;
+            info[i + 2] = "Amount " + EnumChatFormatting.GREEN + defStack.getAmount()/AVOGADRO_CONSTANT+" "+translateToLocal("tt.keyword.mol");
             i += 3;
         }
         return info;
@@ -132,12 +126,12 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
         return nbt;
     }
 
-    default NBTTagCompound toNBT() {
+    default NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
         NBTTagCompound nbt = new NBTTagCompound();
         nbt.setInteger("i", size());
         int i = 0;
         for (Map.Entry<IEMDefinition, T> entry : entrySet()) {
-            nbt.setTag(Integer.toString(i++), entry.getValue().toNBT());
+            nbt.setTag(Integer.toString(i++), entry.getValue().toNBT(registry));
         }
         return nbt;
     }
@@ -265,7 +259,7 @@ public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>
     }
 
     default boolean containsAmount(IEMDefinition def, double amountToConsume) {
-        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        double amountRequired=amountToConsume- EM_COUNT_EPSILON;
         if(amountRequired==amountToConsume){
             amountRequired-=ulpSigned(amountRequired);
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
index f13e82fb26..15815f2ee0 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWrite.java
@@ -2,11 +2,11 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.maps;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 
 import java.util.Map;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_EPSILON;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_EPSILON;
 import static com.github.technus.tectech.util.DoubleCount.*;
 
 public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
@@ -15,11 +15,11 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
     /**
      * Consumes amount from map
      * @param def def to consume
-     * @param amountToConsume should be comparable to {@link EMTransformationInfo#AVOGADRO_CONSTANT}
+     * @param amountToConsume should be comparable to {@link EMTransformationRegistry#EM_COUNT_PER_MATERIAL_AMOUNT}
      * @return consumed successfully
      */
     default boolean removeAmount(IEMDefinition def, double amountToConsume){
-        double amountRequired=amountToConsume-AVOGADRO_CONSTANT_EPSILON;
+        double amountRequired=amountToConsume- EM_COUNT_EPSILON;
         if(amountRequired==amountToConsume){
             amountRequired-=ulpSigned(amountRequired);
         }
@@ -31,7 +31,7 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
         if(current!=null){
             if(current.getAmount()>=amountRequired){
                 double newAmount=sub(current.getAmount(),amountToConsume);
-                if(IEMMapRead.isValidAmount(current.getAmount())){
+                if(IEMStack.isValidAmount(newAmount)){
                     current=(T)current.mutateAmount(newAmount);
                     getBackingMap().put(current.getDefinition(),current);
                 }else {
@@ -88,7 +88,7 @@ public interface IEMMapWrite<T extends IEMStack> extends IEMMapWriteExact<T> {
             return stack;
         }
         double newAmount = add(target.getAmount(), stack.getAmount());
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=(T) target.mutateAmount(newAmount);
             putReplace(stack);
             return stack;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
index 167ec8451d..9da971944c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapWriteExact.java
@@ -7,7 +7,7 @@ import java.util.Map;
 
 public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
     default void cleanUp(){
-        entrySet().removeIf(entry -> IEMMapRead.isInvalidAmount(entry.getValue().getAmount()));
+        entrySet().removeIf(entry -> entry.getValue().isInvalidAmount());
     }
 
     default void clear() {
@@ -95,7 +95,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
         if(current!=null){
             double newAmount=current.getAmount()-amountToConsume;
             if(newAmount>=0){
-                if(IEMMapRead.isValidAmount(current.getAmount())){
+                if(current.isValidAmount()){
                     current=(T)current.mutateAmount(newAmount);
                     getBackingMap().put(current.getDefinition(),current);
                 } else {
@@ -142,7 +142,7 @@ public interface IEMMapWriteExact<T extends IEMStack> extends IEMMapRead<T> {
             return stack;
         }
         double newAmount = target.getAmount()+stack.getAmount();
-        if (IEMMapRead.isValidAmount(newAmount)) {
+        if (IEMStack.isValidAmount(newAmount)) {
             stack=(T) target.mutateAmount(newAmount);
             putReplace(stack);
             return stack;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
index f868dbe0ad..c1e6a729f8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMDefinitionStack.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -41,16 +41,16 @@ public final class EMDefinitionStack implements IEMStack {
         return amount;
     }
 
-    public NBTTagCompound toNBT() {
+    public NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
         NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setTag("d", getDefinition().toNBT(registry));
         nbt.setDouble("Q", getAmount());
         return nbt;
     }
 
-    public static EMDefinitionStack fromNBT(NBTTagCompound nbt) {
+    public static EMDefinitionStack fromNBT(EMDefinitionsRegistry registry,NBTTagCompound nbt) {
         return new EMDefinitionStack(
-                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
+                registry.fromNBT(nbt.getCompoundTag("d")),
                 nbt.getLong("q")+nbt.getDouble("Q"));
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
index 6347cd2144..b67d2ce121 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.util.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
@@ -14,19 +14,22 @@ import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.null__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.DoubleCount.*;
-import static java.lang.Math.*;
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
 public final class EMInstanceStack implements IEMStack {
     public static int MIN_MULTIPLE_DECAY_CALLS = 4, MAX_MULTIPLE_DECAY_CALLS = 16;
-    public static double DECAY_CALL_PER = AVOGADRO_CONSTANT;//todo
+    public static double DECAY_CALL_PER = EM_COUNT_PER_MATERIAL_AMOUNT;//todo
 
     private final IEMDefinition definition;
     private       double        amount;
@@ -35,7 +38,7 @@ public final class EMInstanceStack implements IEMStack {
     //energy - if positive then particle should try to decay
     private long   energy;
     //byte color; 0=Red 1=Green 2=Blue 0=Cyan 1=Magenta 2=Yellow, else ignored (-1 - uncolorable)
-    private byte   color;
+    private int   color;
     private double lifeTime;
     private double lifeTimeMult;
 
@@ -53,11 +56,10 @@ public final class EMInstanceStack implements IEMStack {
 
     public EMInstanceStack(IEMDefinition defSafe, double amount, double lifeTimeMult, double age, long energy) {
         definition = defSafe == null ? null__ : defSafe;
-        byte bColor = getDefinition().getColor();
-        if (bColor < 0 || bColor > 2) {//transforms colorable??? into proper color
-            this.color = bColor;
-        } else {
-            this.color = (byte) TecTech.RANDOM.nextInt(3);
+        if (getDefinition().hasColor()) {
+            this.color = (byte) TecTech.RANDOM.nextInt(getDefinition().getMaxColors());
+        } else {//transforms colorable??? into proper color
+            this.color = getDefinition().getMaxColors();
         }
         this.lifeTimeMult = lifeTimeMult;
         lifeTime = getDefinition().getRawTimeSpan(energy) * this.lifeTimeMult;
@@ -119,11 +121,11 @@ public final class EMInstanceStack implements IEMStack {
         return definition;
     }
 
-    public byte getColor() {
+    public int getColor() {
         return color;
     }
 
-    public void setColor(byte color) {//does not allow changing magic element
+    public void setColor(int color) {//does not allow changing magic element
         if (this.color < 0 || this.color > 2 || color < 0 || color >= 3) {
             return;
         }
@@ -131,10 +133,9 @@ public final class EMInstanceStack implements IEMStack {
     }
 
     public void nextColor() {//does not allow changing magic element
-        if (color < 0 || color > 2) {
-            return;
+        if (definition.hasColor()) {
+            color = (byte) TecTech.RANDOM.nextInt(definition.getMaxColors());
         }
-        color = (byte) TecTech.RANDOM.nextInt(3);
     }
 
     public double getLifeTime() {
@@ -524,7 +525,7 @@ public final class EMInstanceStack implements IEMStack {
             lines.add("ENERGY = " + energy);
         }
         if (Util.areBitsSet(SCAN_GET_AMOUNT, capabilities)) {
-            lines.add("AMOUNT = " + getAmount() / AVOGADRO_CONSTANT + " mol");
+            lines.add("AMOUNT = " + getAmount() /AVOGADRO_CONSTANT + " "+translateToLocal("tt.keyword.mol"));
         }
         scanContents(lines, getDefinition().getSubParticles(), 1, detailsOnDepthLevels);
     }
@@ -546,25 +547,25 @@ public final class EMInstanceStack implements IEMStack {
         }
     }
 
-    public NBTTagCompound toNBT() {
+    public NBTTagCompound toNBT(EMDefinitionsRegistry registry) {
         NBTTagCompound nbt = new NBTTagCompound();
-        nbt.setTag("d", getDefinition().toNBT());
+        nbt.setTag("d", getDefinition().toNBT(registry));
         nbt.setDouble("Q", getAmount());
-        nbt.setLong("e", energy);
-        nbt.setByte("c", color);
-        nbt.setDouble("A", getAge());
         nbt.setDouble("M", lifeTimeMult);
+        nbt.setDouble("A", getAge());
+        nbt.setLong("e", energy);
+        nbt.setInteger("c", color);
         return nbt;
     }
 
-    public static EMInstanceStack fromNBT(NBTTagCompound nbt) {
+    public static EMInstanceStack fromNBT(EMDefinitionsRegistry registry, NBTTagCompound nbt) {
         EMInstanceStack instance = new EMInstanceStack(
-                EMDefinitionsRegistry.fromNBT(nbt.getCompoundTag("d")),
-                nbt.getLong("q") + nbt.getDouble("Q"),
-                nbt.getFloat("m") + nbt.getDouble("M"),
-                nbt.getLong("a") + nbt.getDouble("A"),
+                registry.fromNBT(nbt.getCompoundTag("d")),
+                nbt.getDouble("Q"),
+                nbt.getDouble("M"),
+                nbt.getDouble("A"),
                 nbt.getLong("e"));
-        instance.setColor(nbt.getByte("c"));
+        instance.setColor(nbt.getInteger("c"));
         return instance;
     }
 
@@ -587,7 +588,7 @@ public final class EMInstanceStack implements IEMStack {
 
     @Override
     public String toString() {
-        return getDefinition().toString() + '\n' + getAmount() / AVOGADRO_CONSTANT + " mol\n" + getMass();
+        return getDefinition().toString() + ' ' + getAmount() /AVOGADRO_CONSTANT + " "+translateToLocal("tt.keyword.mol")+" " + getMass()+" eV/c^2";
     }
 
     public void setAmount(double amount) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
index 5672b31c04..e5cfab9752 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/IEMStack.java
@@ -1,37 +1,56 @@
 package com.github.technus.tectech.mechanics.elementalMatter.core.stacks;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import net.minecraft.nbt.NBTTagCompound;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_MINIMUM;
+
 /**
  * Created by danie_000 on 30.01.2017.
  */
-public interface IEMStack extends Comparable<IEMStack>,Cloneable {
+public interface IEMStack extends Comparable<IEMStack>, Cloneable {
+    static boolean isValidAmount(double amount) {
+        return amount >= EM_COUNT_MINIMUM;
+    }
+
+    static boolean isInvalidAmount(double amount) {
+        return amount < EM_COUNT_MINIMUM;
+    }
+    default boolean isValidAmount() {
+        return isValidAmount(getAmount());
+    }
+
+    default boolean isInvalidAmount() {
+        return isInvalidAmount(getAmount());
+    }
+
     IEMDefinition getDefinition();
 
     double getAmount();
 
-    default double getCharge(){
-        return getDefinition().getCharge()*getAmount();
+    default double getCharge() {
+        return getDefinition().getCharge() * getAmount();
     }
 
-    default double getMass(){
-        return getDefinition().getMass()*getAmount();
+    default double getMass() {
+        return getDefinition().getMass() * getAmount();
     }
 
     IEMStack clone();
 
     /**
      * Will return stack with mutated amount, it might be a new object!
+     *
      * @param newAmount new amount
      * @return new stack (or previous one if was mutable)
      */
     IEMStack mutateAmount(double newAmount);
 
-    NBTTagCompound toNBT();
+    NBTTagCompound toNBT(EMDefinitionsRegistry registry);
 
     @Override
-    default int compareTo(IEMStack o){
+    default int compareTo(IEMStack o) {
         return getDefinition().compareTo(o.getDefinition());
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java
new file mode 100644
index 0000000000..855be96797
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMDequantizationInfo.java
@@ -0,0 +1,56 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public class EMDequantizationInfo {
+    private final IEMStack definition;
+    private       Object   stack;
+
+    public EMDequantizationInfo(IEMStack definition) {
+        this.definition = definition;
+    }
+
+    public IEMStack getInput() {
+        return definition;
+    }
+
+    public FluidStack getFluid() {
+        return ((FluidStack) stack).copy();
+    }
+
+    public void setFluid(FluidStack fluid) {
+        this.stack = fluid;
+    }
+
+    public ItemStack getItem() {
+        return ((ItemStack) stack).copy();
+    }
+
+    public void setItem(ItemStack item) {
+        this.stack = item;
+    }
+
+    public OreDictionaryStack getOre() {
+        return (OreDictionaryStack) stack;
+    }
+
+    public void setOre(OreDictionaryStack ore) {
+        this.stack = ore;
+    }
+
+    public Object getStack() {
+        return stack;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return o instanceof EMDequantizationInfo && definition.equals(((EMDequantizationInfo) o).definition);
+    }
+
+    @Override
+    public int hashCode() {
+        return definition.hashCode();
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
deleted file mode 100644
index d74c36170e..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidDequantizationInfo.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class EMFluidDequantizationInfo implements IEMExchangeInfo<IEMStack,FluidStack> {
-    private final IEMStack   in;
-    private final FluidStack out;
-
-    public EMFluidDequantizationInfo(IEMStack emIn, FluidStack fluidStackOut){
-        in=emIn;
-        out=fluidStackOut;
-    }
-
-    public EMFluidDequantizationInfo(IEMStack emIn, Fluid fluid, int fluidAmount){
-        in=emIn;
-        out=new FluidStack(fluid,fluidAmount);
-    }
-
-    @Override
-    public IEMStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public FluidStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof EMFluidDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
index 43fb5550aa..cf0cc6218c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMFluidQuantizationInfo.java
@@ -7,7 +7,7 @@ import net.minecraftforge.fluids.FluidStack;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class EMFluidQuantizationInfo implements IEMExchangeInfo<FluidStack, IEMStack> {
+public class EMFluidQuantizationInfo {
     private final FluidStack in;
     private final IEMStack   out;
 
@@ -21,12 +21,10 @@ public class EMFluidQuantizationInfo implements IEMExchangeInfo<FluidStack, IEMS
         out=emOut;
     }
 
-    @Override
     public FluidStack input() {
         return in.copy();
     }
 
-    @Override
     public IEMStack output() {
         return out.clone();
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
deleted file mode 100644
index af741c703d..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemDequantizationInfo.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class EMItemDequantizationInfo implements IEMExchangeInfo<IEMStack,ItemStack> {
-    private final IEMStack  in;
-    private final ItemStack out;
-
-    public EMItemDequantizationInfo(IEMStack emIn, ItemStack itemStackOut){
-        in=emIn;
-        out=itemStackOut;
-    }
-
-    public EMItemDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int amount) {
-        in = emIn;
-        out = GT_OreDictUnificator.get(prefix, material, amount);
-    }
-
-    @Override
-    public IEMStack input() {
-        return in.clone();
-    }
-
-    @Override
-    public ItemStack output() {
-        return out.copy();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof EMItemDequantizationInfo && hashCode() == obj.hashCode();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
index 553e806d38..c5db63b3ad 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMItemQuantizationInfo.java
@@ -11,7 +11,7 @@ import net.minecraftforge.oredict.OreDictionary;
 /**
  * Created by Tec on 23.05.2017.
  */
-public class EMItemQuantizationInfo implements IEMExchangeInfo<ItemStack, IEMStack> {
+public class EMItemQuantizationInfo {
     private final ItemStack in;
     private final boolean   skipNBT;
     private final IEMStack  out;
@@ -28,12 +28,10 @@ public class EMItemQuantizationInfo implements IEMExchangeInfo<ItemStack, IEMSta
         this.skipNBT = skipNBT;
     }
 
-    @Override
     public ItemStack input() {
         return in.copy();
     }
 
-    @Override
     public IEMStack output() {
         return out.clone();
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
deleted file mode 100644
index c8e337c7fd..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictDequantizationInfo.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public class EMOredictDequantizationInfo implements IEMExchangeInfo<IEMStack,String> {
-    private final IEMStack in;
-    private final String   out;
-    private final int      amount;
-
-    public EMOredictDequantizationInfo(IEMStack emIn, String name, int qty) {
-        in = emIn;
-        out =name;
-        amount = qty;
-    }
-
-    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, Materials material, int qty) {
-        in = emIn;
-        out = prefix.name() + material.mName;
-        amount = qty;
-    }
-
-    public EMOredictDequantizationInfo(IEMStack emIn, OrePrefixes prefix, String materialName, int qty) {
-        in = emIn;
-        out = prefix.name() + materialName;
-        amount = qty;
-    }
-
-    @Override
-    public IEMStack input() {
-        return in.clone();//MEH!
-    }
-
-    @Override
-    public String output() {
-        return getOut();
-    }
-
-    @Override
-    public int hashCode() {
-        return in.getDefinition().hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        return obj instanceof EMOredictDequantizationInfo && hashCode() == obj.hashCode();
-    }
-
-    public String getOut() {
-        return out;
-    }
-
-    public int getAmount() {
-        return amount;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
index 0ca0415b0d..3c54dd86ac 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMOredictQuantizationInfo.java
@@ -3,46 +3,41 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.transformation
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import net.minecraftforge.oredict.OreDictionary;
 
 /**
  * Created by Tec on 23.05.2017.
  */
-public class EMOredictQuantizationInfo implements IEMExchangeInfo<String, IEMStack> {
-    private final String   in;
+public class EMOredictQuantizationInfo {
+    private final int      id;
     private final int      amount;
     private final IEMStack out;
 
-    public EMOredictQuantizationInfo(String name, int qty, IEMStack emOut){
-        in=name;
-        amount=qty;
-        out=emOut;
+    public EMOredictQuantizationInfo(int id, int amount, IEMStack out) {
+        this.id = id;
+        this.amount = amount;
+        this.out = out;
     }
 
-    public EMOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, IEMStack emOut){
-        in=prefix.name() + material.mName;
-        amount=qty;
-        out=emOut;
+    public EMOredictQuantizationInfo(String name, int qty, IEMStack emOut) {
+        this(OreDictionary.getOreID(name),qty,emOut);
     }
 
-    public EMOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, IEMStack emOut){
-        in=prefix.name() + materialName;
-        amount=qty;
-        out=emOut;
+    public EMOredictQuantizationInfo(OrePrefixes prefix, Materials material, int qty, IEMStack emOut) {
+        this(prefix, material.mName, qty,emOut);
     }
 
-    @Override
-    public String input() {
-        return getIn();
+    public EMOredictQuantizationInfo(OrePrefixes prefix, String materialName, int qty, IEMStack emOut) {
+        this(OreDictionary.getOreID(prefix.name() + materialName),qty,emOut);
     }
 
-    @Override
-    public IEMStack output() {
-        return out.clone();
+    public IEMStack getOut() {
+        return out;
     }
 
     @Override
     public int hashCode() {
-        return getIn().hashCode();
+        return getId();
     }
 
     @Override
@@ -50,8 +45,8 @@ public class EMOredictQuantizationInfo implements IEMExchangeInfo<String, IEMSta
         return obj instanceof EMOredictQuantizationInfo && hashCode() == obj.hashCode();
     }
 
-    public String getIn() {
-        return in;
+    public int getId() {
+        return id;
     }
 
     public int getAmount() {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
deleted file mode 100644
index d6f6731aec..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationInfo.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static java.lang.Math.pow;
-
-/**
- * Created by Tec on 26.05.2017.
- */
-public class EMTransformationInfo {
-    /**
-     * Atom count per Mol
-     */
-    public static final double AVOGADRO_CONSTANT =6.02214076e23D;
-    /**
-     * Min. chance of existing
-     */
-    public static final double AVOGADRO_CONSTANT_UNCERTAINTY =(144*1000) / AVOGADRO_CONSTANT;
-    /**
-     * Quantity considered to be indifferent when computing stuff
-     */
-    public static final double AVOGADRO_CONSTANT_EPSILON = AVOGADRO_CONSTANT / pow(2,48);
-    public static final double AVOGADRO_CONSTANT_DIMINISHED = AVOGADRO_CONSTANT - AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_144 = AVOGADRO_CONSTANT *144D;
-    public static final double AVOGADRO_CONSTANT_144_DIMINISHED = AVOGADRO_CONSTANT_144 - AVOGADRO_CONSTANT_EPSILON;
-    public static final double AVOGADRO_CONSTANT_1000 = AVOGADRO_CONSTANT *1000D;
-    public static final double AVOGADRO_CONSTANT_1000_DIMINISHED = AVOGADRO_CONSTANT_1000 - AVOGADRO_CONSTANT_EPSILON;
-
-    public static EMTransformationInfo TRANSFORMATION_INFO = new EMTransformationInfo();
-
-    private Map<Integer, EMFluidQuantizationInfo>               fluidQuantization;
-    private Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization;
-    private Map<Integer, EMOredictQuantizationInfo>             oredictQuantization;
-
-    private Map<IEMDefinition, EMFluidDequantizationInfo>   fluidDequantization;
-    private Map<IEMDefinition, EMItemDequantizationInfo>    itemDequantization;
-    private Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization;
-
-    private EMTransformationInfo() {
-        this(
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
-                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64)
-        );
-    }
-
-    public EMTransformationInfo(
-            Map<Integer, EMFluidQuantizationInfo> fluidQuantization,
-            Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization,
-            Map<Integer, EMOredictQuantizationInfo> oredictQuantization,
-            Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization,
-            Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization,
-            Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
-        this.setFluidQuantization(fluidQuantization);
-        this.setItemQuantization(itemQuantization);
-        this.setOredictQuantization(oredictQuantization);
-        this.setFluidDequantization(fluidDequantization);
-        this.setItemDequantization(itemDequantization);
-        this.setOredictDequantization(oredictDequantization);
-    }
-
-    public void addFluid(IEMStack em, FluidStack fluidStack){
-        getFluidQuantization().put(fluidStack.getFluidID(),new EMFluidQuantizationInfo(fluidStack,em));
-        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluidStack));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addFluid(IEMStack em, Fluid fluid, int fluidAmount){
-        getFluidQuantization().put(fluid.getID(),new EMFluidQuantizationInfo(fluid,fluidAmount,em));
-        getFluidDequantization().put(em.getDefinition(),new EMFluidDequantizationInfo(em,fluid,fluidAmount));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    private void addItemQuantization(EMItemQuantizationInfo aIQI){
-        getItemQuantization().put(aIQI,aIQI);
-    }
-
-    public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT){
-        addItemQuantization(new EMItemQuantizationInfo(itemStack,skipNBT,em));
-        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,itemStack));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT){
-        addItemQuantization(new EMItemQuantizationInfo(prefix,material,amount,skipNBT,em));
-        getItemDequantization().put(em.getDefinition(),new EMItemDequantizationInfo(em,prefix,material,amount));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addOredict(IEMStack em, String name, int qty){
-        getOredictQuantization().put(OreDictionary.getOreID(name),new EMOredictQuantizationInfo(name,qty,em));
-        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,name,qty));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty){
-        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + material.mName),new EMOredictQuantizationInfo(prefix,material,qty,em));
-        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,material,qty));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty){
-        getOredictQuantization().put(OreDictionary.getOreID(prefix.name() + materialName),new EMOredictQuantizationInfo(prefix,materialName,qty,em));
-        getOredictDequantization().put(em.getDefinition(),new EMOredictDequantizationInfo(em,prefix,materialName,qty));
-        EMDefinitionsRegistry.registerForDisplay(em.getDefinition());
-    }
-
-    public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
-        return fluidQuantization;
-    }
-
-    public void setFluidQuantization(Map<Integer, EMFluidQuantizationInfo> fluidQuantization) {
-        this.fluidQuantization = fluidQuantization;
-    }
-
-    public Map<EMItemQuantizationInfo, EMItemQuantizationInfo> getItemQuantization() {
-        return itemQuantization;
-    }
-
-    public void setItemQuantization(Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization) {
-        this.itemQuantization = itemQuantization;
-    }
-
-    public Map<Integer, EMOredictQuantizationInfo> getOredictQuantization() {
-        return oredictQuantization;
-    }
-
-    public void setOredictQuantization(Map<Integer, EMOredictQuantizationInfo> oredictQuantization) {
-        this.oredictQuantization = oredictQuantization;
-    }
-
-    public Map<IEMDefinition, EMFluidDequantizationInfo> getFluidDequantization() {
-        return fluidDequantization;
-    }
-
-    public void setFluidDequantization(Map<IEMDefinition, EMFluidDequantizationInfo> fluidDequantization) {
-        this.fluidDequantization = fluidDequantization;
-    }
-
-    public Map<IEMDefinition, EMItemDequantizationInfo> getItemDequantization() {
-        return itemDequantization;
-    }
-
-    public void setItemDequantization(Map<IEMDefinition, EMItemDequantizationInfo> itemDequantization) {
-        this.itemDequantization = itemDequantization;
-    }
-
-    public Map<IEMDefinition, EMOredictDequantizationInfo> getOredictDequantization() {
-        return oredictDequantization;
-    }
-
-    public void setOredictDequantization(Map<IEMDefinition, EMOredictDequantizationInfo> oredictDequantization) {
-        this.oredictDequantization = oredictDequantization;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java
new file mode 100644
index 0000000000..5e41beb9fd
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/EMTransformationRegistry.java
@@ -0,0 +1,134 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+import static java.lang.Math.pow;
+
+/**
+ * Created by Tec on 26.05.2017.
+ */
+public class EMTransformationRegistry {
+    /**
+     * Atom count per Mol
+     */
+    public static final double AVOGADRO_CONSTANT            = 6.02214076e23D;
+    /**
+     * Scale to 1m^3 of C-12
+     */
+    public static final double EM_COUNT_PER_CUBE            = AVOGADRO_CONSTANT * 1650_000D / 0.012;
+    public static final double EM_COUNT_PER_MATERIAL_AMOUNT = EM_COUNT_PER_CUBE / 144 / 9;
+    public static final double EM_COUNT_PER_ITEM            = EM_COUNT_PER_CUBE * 9;
+    public static final double EM_COUNT_PER_1k              = EM_COUNT_PER_MATERIAL_AMOUNT * 1000;
+
+    public static final double EM_COUNT_MINIMUM = 1 / EM_COUNT_PER_CUBE;
+    /**
+     * Quantity considered to be indifferent when computing stuff
+     */
+    public static final double EM_COUNT_EPSILON = EM_COUNT_PER_CUBE / pow(2, 40);
+
+    public static final double EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED = EM_COUNT_PER_MATERIAL_AMOUNT - EM_COUNT_EPSILON;
+    public static final double EM_COUNT_PER_CUBE_DIMINISHED            = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 144 * 9;
+    public static final double EM_COUNT_PER_ITEM_DIMINISHED            = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 144;
+    public static final double EM_COUNT_PER_1k_DIMINISHED              = EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * 1000;
+
+    private final Map<Integer, EMFluidQuantizationInfo>               fluidQuantization;
+    private final Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization;
+    private final Map<Integer, EMOredictQuantizationInfo>             oredictQuantization;
+
+    private final Map<IEMDefinition, EMDequantizationInfo> infoMap;
+    private final Function<IEMStack, EMDequantizationInfo> creator;
+
+    public EMTransformationRegistry() {
+        this(EMDequantizationInfo::new);
+    }
+
+    public EMTransformationRegistry(Function<IEMStack, EMDequantizationInfo> creator) {
+        this(creator,
+                new HashMap<>(16), new HashMap<>(16), new HashMap<>(64),
+                new HashMap<>(256)
+        );
+    }
+
+    public EMTransformationRegistry(Function<IEMStack, EMDequantizationInfo> creator,
+                                    Map<Integer, EMFluidQuantizationInfo> fluidQuantization,
+                                    Map<EMItemQuantizationInfo, EMItemQuantizationInfo> itemQuantization,
+                                    Map<Integer, EMOredictQuantizationInfo> oredictQuantization,
+                                    Map<IEMDefinition, EMDequantizationInfo> infoMap) {
+        this.creator = creator;
+        this.fluidQuantization = fluidQuantization;
+        this.itemQuantization = itemQuantization;
+        this.oredictQuantization = oredictQuantization;
+        this.infoMap = infoMap;
+    }
+
+    protected EMDequantizationInfo compute(IEMStack em) {
+        return infoMap.computeIfAbsent(em.getDefinition(), stack -> creator.apply(em));
+    }
+
+    public void addFluid(IEMStack em, FluidStack fluidStack) {
+        getFluidQuantization().put(fluidStack.getFluidID(), new EMFluidQuantizationInfo(fluidStack, em));
+        compute(em).setFluid(fluidStack);
+    }
+
+    public void addFluid(IEMStack em, Fluid fluid, int fluidAmount) {
+        addFluid(em, new FluidStack(fluid, fluidAmount));
+    }
+
+    protected void addItemQuantization(EMItemQuantizationInfo aIQI) {
+        getItemQuantization().put(aIQI, aIQI);
+    }
+
+    public void addItem(IEMStack em, ItemStack itemStack, boolean skipNBT) {
+        addItemQuantization(new EMItemQuantizationInfo(itemStack, skipNBT, em));
+        compute(em).setItem(itemStack);
+    }
+
+    public void addItem(IEMStack em, OrePrefixes prefix, Materials material, int amount, boolean skipNBT) {
+        addItem(em, GT_OreDictUnificator.get(prefix, material, amount), skipNBT);
+    }
+
+    public void addOredict(IEMStack em, int id, int qty) {
+        getOredictQuantization().put(id, new EMOredictQuantizationInfo(id, qty, em));
+        compute(em).setOre(new OreDictionaryStack(qty, id));
+    }
+
+    public void addOredict(IEMStack em, String name, int qty) {
+        addOredict(em, OreDictionary.getOreID(name), qty);
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, Materials material, int qty) {
+        addOredict(em, prefix, material.mName, qty);
+    }
+
+    public void addOredict(IEMStack em, OrePrefixes prefix, String materialName, int qty) {
+        addOredict(em, OreDictionary.getOreID(prefix.name() + materialName), qty);
+    }
+
+    public Map<Integer, EMFluidQuantizationInfo> getFluidQuantization() {
+        return fluidQuantization;
+    }
+
+    public Map<EMItemQuantizationInfo, EMItemQuantizationInfo> getItemQuantization() {
+        return itemQuantization;
+    }
+
+    public Map<Integer, EMOredictQuantizationInfo> getOredictQuantization() {
+        return oredictQuantization;
+    }
+
+    public Map<IEMDefinition, EMDequantizationInfo> getInfoMap() {
+        return infoMap;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
deleted file mode 100644
index e20b0af3b5..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/IEMExchangeInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
-
-/**
- * Created by Tec on 23.05.2017.
- */
-public interface IEMExchangeInfo<IN,OUT> {
-    OUT output();//what should be given - ItemStack,FluidStack,AspectStack, (EM definitionStack->)EM instance stack - etc.
-    //This must return new Object! - if obj is immutable don't care that much (applies to defStacks)
-
-    IN input();//same as above but for input
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java
new file mode 100644
index 0000000000..f5d8d42061
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/transformations/OreDictionaryStack.java
@@ -0,0 +1,19 @@
+package com.github.technus.tectech.mechanics.elementalMatter.core.transformations;
+
+public class OreDictionaryStack {
+    private final int amount;
+    private final int id;
+
+    public OreDictionaryStack(int amount, int id) {
+        this.amount = amount;
+        this.id = id;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public int getOreId() {
+        return id;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 37ecb861f8..76f4457e94 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -1,69 +1,65 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.complex;
 
-import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.gtpp.GtppAtomLoader;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.util.XSTR;
-import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Materials;
-import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.*;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.deadEnd;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
+import static gregtech.api.enums.Materials.*;
 import static gregtech.api.enums.OrePrefixes.dust;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 18.11.2016.
  */
-public final class EMAtomDefinition extends EMComplexTemplate {
-    public static final long ATOM_COMPLEXITY_LIMIT=65536L;
-    private static final byte BYTE_OFFSET=32;
+public class EMAtomDefinition extends EMComplexTemplate {
+    public static final  long ATOM_COMPLEXITY_LIMIT = 65536L;
+    private static final byte BYTE_OFFSET           = 32;
 
-    private final int hash;
+    private final int    hash;
     public static double refMass, refUnstableMass;
 
-    private static final byte                                   nbtType                    = (byte) 'a';
+    private static final String                                 nbtType                    = "a";
     private static final Random                                 xstr                       = new XSTR();//NEEDS SEPARATE!
     private static       Map<Integer, TreeSet<Integer>>         stableIsotopes             = new HashMap<>();
     private static final Map<Integer, EMAtomDefinition>         stableAtoms                = new HashMap<>();
     private static       Map<Integer, TreeMap<Double, Integer>> mostStableUnstableIsotopes = new HashMap<>();
     private static final Map<Integer, EMAtomDefinition>         unstableAtoms              = new HashMap<>();
-    private static       EMDefinitionStack                      alpha,deuterium,tritium,helium_3,beryllium_8,carbon_14,neon_24,silicon_34;
-    private static final HashMap<EMAtomDefinition,Double> lifetimeOverrides = new HashMap<>();
+    private static       EMDefinitionStack                      alpha, deuterium, tritium, helium_3, beryllium_8, carbon_14, neon_24, silicon_34, uranium_238, uranium_235, plutonium_239, plutonium_241;
+    private static final HashMap<EMAtomDefinition, Double> lifetimeOverrides = new HashMap<>();
 
     private final EMNuclideIAEA iaea;
 
     private static EMAtomDefinition somethingHeavy;
+
     public static EMAtomDefinition getSomethingHeavy() {
         return somethingHeavy;
     }
 
     private static final ArrayList<Runnable> overrides = new ArrayList<>();
-    public static void addOverride(EMAtomDefinition atom, double rawLifeTime){
-        lifetimeOverrides.put(atom,rawLifeTime);
+
+    public static void addOverride(EMAtomDefinition atom, double rawLifeTime) {
+        lifetimeOverrides.put(atom, rawLifeTime);
     }
 
     //float-mass in eV/c^2
@@ -106,23 +102,23 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
         elementalStacks = things;
 
-        double mass = 0;
-        int cLeptons = 0;
-        int cNucleus = 0;
-        int neutralCount = 0, element = 0;
-        int type = 0;
+        double  mass         = 0;
+        int     cLeptons     = 0;
+        int     cNucleus     = 0;
+        int     neutralCount = 0, element = 0;
+        int     type         = 0;
         boolean containsAnti = false;
         for (EMDefinitionStack stack : elementalStacks.valuesToArray()) {
             IEMDefinition def    = stack.getDefinition();
             int           amount = (int) stack.getAmount();
-            if((int) stack.getAmount() != stack.getAmount()){
+            if ((int) stack.getAmount() != stack.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             mass += stack.getMass();
-            if (def.getMatterType() < 0) {
+            if (def.getGeneration() < 0) {
                 containsAnti = true;
             }
-            type = Math.max(type, Math.abs(def.getMatterType()));
+            type = Math.max(type, Math.abs(def.getGeneration()));
 
             if (def instanceof EMLeptonDefinition) {
                 cLeptons += stack.getCharge();
@@ -148,57 +144,57 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
         //stability curve
         int StableIsotope = stableIzoCurve(element);
-        int izoDiff = neutralCount - StableIsotope;
-        int izoDiffAbs = Math.abs(izoDiff);
+        int izoDiff       = neutralCount - StableIsotope;
+        int izoDiffAbs    = Math.abs(izoDiff);
 
         xstr.setSeed((element + 1L) * (neutralCount + 100L));
-        iaea = EMNuclideIAEA.get(element,neutralCount);
-        if(getIaea() !=null){
-            if(Double.isNaN(getIaea().getMass())) {
+        iaea = EMNuclideIAEA.get(element, neutralCount);
+        if (getIaea() != null) {
+            if (Double.isNaN(getIaea().getMass())) {
                 this.mass = mass;
             } else {
                 this.mass = getIaea().getMass();
             }
 
-            if(Double.isNaN(getIaea().getHalfTime())) {
-                Double overriddenLifeTime= lifetimeOverrides.get(this);
+            if (Double.isNaN(getIaea().getHalfTime())) {
+                Double overriddenLifeTime = lifetimeOverrides.get(this);
                 double rawLifeTimeTemp;
-                if(overriddenLifeTime!=null) {
+                if (overriddenLifeTime != null) {
                     rawLifeTimeTemp = overriddenLifeTime;
                 } else {
                     rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
                 }
                 rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
-            }else {
+            } else {
                 rawLifeTime = containsAnti ? getIaea().getHalfTime() * 1.5514433E-21d * (1d + xstr.nextDouble() * 9d) : getIaea().getHalfTime();
             }
-            iaeaDefinitionExistsAndHasEnergyLevels = getIaea().getEnergeticStatesArray().length>1;
-        }else{
-            this.mass=mass;
+            iaeaDefinitionExistsAndHasEnergyLevels = getIaea().getEnergeticStatesArray().length > 1;
+        } else {
+            this.mass = mass;
 
-            Double overriddenLifeTime= lifetimeOverrides.get(this);
+            Double overriddenLifeTime = lifetimeOverrides.get(this);
             double rawLifeTimeTemp;
-            if(overriddenLifeTime!=null) {
+            if (overriddenLifeTime != null) {
                 rawLifeTimeTemp = overriddenLifeTime;
             } else {
                 rawLifeTimeTemp = calculateLifeTime(izoDiff, izoDiffAbs, element, neutralCount, containsAnti);
             }
             rawLifeTime = Math.min(rawLifeTimeTemp, STABLE_RAW_LIFE_TIME);
 
-            iaeaDefinitionExistsAndHasEnergyLevels =false;
+            iaeaDefinitionExistsAndHasEnergyLevels = false;
         }
 
-        if(getIaea() ==null || getIaea().getEnergeticStatesArray()[0].energy!=0) {
+        if (getIaea() == null || getIaea().getEnergeticStatesArray()[0].energy != 0) {
             if (izoDiff == 0) {
                 decayMode = 0;
             } else {
                 decayMode = izoDiff > 0 ? (byte) Math.min(2, 1 + izoDiffAbs / 4) : (byte) -Math.min(2, 1 + izoDiffAbs / 4);
             }
-        }else{
-            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4)+ BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
+        } else {
+            decayMode = izoDiff > 0 ? (byte) (Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET) : (byte) (-Math.min(2, 1 + izoDiffAbs / 4) + BYTE_OFFSET);
         }
         //this.stable = this.rawLifeTime >= STABLE_RAW_LIFE_TIME;
-        hash=super.hashCode();
+        hash = super.hashCode();
     }
 
     private static int stableIzoCurve(int element) {
@@ -267,7 +263,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     private static boolean canTheyBeTogether(EMConstantStackMap stacks) {
         boolean nuclei = false;
-        long qty=0;
+        long    qty    = 0;
         for (EMDefinitionStack stack : stacks.valuesToArray()) {
             if (stack.getDefinition() instanceof EMHadronDefinition) {
                 if (((EMHadronDefinition) stack.getDefinition()).getAmount() != 3) {
@@ -277,12 +273,12 @@ public final class EMAtomDefinition extends EMComplexTemplate {
             } else if (!(stack.getDefinition() instanceof EMLeptonDefinition)) {
                 return false;
             }
-            if((int) stack.getAmount() != stack.getAmount()){
+            if ((int) stack.getAmount() != stack.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
-            qty+= stack.getAmount();
+            qty += stack.getAmount();
         }
-        return nuclei && qty<ATOM_COMPLEXITY_LIMIT;
+        return nuclei && qty < ATOM_COMPLEXITY_LIMIT;
     }
 
     @Override
@@ -308,22 +304,22 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getMatterType() {
+    public int getGeneration() {
         return type;
     }
 
     @Override
     public double getRawTimeSpan(long currentEnergy) {
-        if(currentEnergy<=0) {
+        if (currentEnergy <= 0) {
             return rawLifeTime;
         }
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            if(currentEnergy>= getIaea().getEnergeticStatesArray().length){
-                return getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].Thalf/(currentEnergy- getIaea().getEnergeticStatesArray().length+1);
+        if (iaeaDefinitionExistsAndHasEnergyLevels) {
+            if (currentEnergy >= getIaea().getEnergeticStatesArray().length) {
+                return getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1].Thalf / (currentEnergy - getIaea().getEnergeticStatesArray().length + 1);
             }
-            return getIaea().getEnergeticStatesArray()[(int)currentEnergy].Thalf;
+            return getIaea().getEnergeticStatesArray()[(int) currentEnergy].Thalf;
         }
-        return rawLifeTime/(currentEnergy+1);
+        return rawLifeTime / (currentEnergy + 1);
     }
 
     @Override
@@ -332,16 +328,16 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return -10;
     }
 
     @Override
     public String getLocalizedName() {
-        int element = Math.abs(this.getElement());
+        int     element  = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
-            if (Math.abs(getMatterType()) != 1) {
+            if (Math.abs(getGeneration()) != 1) {
                 return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
             }
             return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
@@ -349,35 +345,35 @@ public final class EMAtomDefinition extends EMComplexTemplate {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
-            return translateToLocal("tt.keyword.Element")+(negative ? ": ~" : ": ") + element;
+            return translateToLocal("tt.keyword.Element") + (negative ? ": ~" : ": ") + element;
         }
     }
 
     @Override
     public String getSymbol() {
-        int element = Math.abs(this.getElement());
+        int     element  = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
         } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
             try {
                 int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
             } catch (Exception E) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
-                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() +element) + " C:" + getCharge();
+                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
             }
         }
     }
 
     @Override
     public String getShortSymbol() {
-        int element = Math.abs(this.getElement());
+        int     element  = Math.abs(this.getElement());
         boolean negative = this.getElement() < 0;
         try {
             return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
@@ -404,69 +400,69 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public EMDecay[] getDecayArray() {
-        ArrayList<EMDecay> decaysList =new ArrayList<>(4);
-        return getDecayArray(decaysList, getDecayMode(),true);
+        ArrayList<EMDecay> decaysList = new ArrayList<>(4);
+        return getDecayArray(decaysList, getDecayMode(), true);
     }
 
     private EMDecay[] getDecayArray(ArrayList<EMDecay> decaysList, int decayMode, boolean tryAnti) {//todo?
-        if (getMatterType() == 1) {
+        if (getGeneration() == 1) {
             switch (decayMode) {
                 case -2:
-                    if(TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
+                    if (TecTech.RANDOM.nextBoolean() && ElectronCapture(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
-                    } else if(PbetaDecay(decaysList)) {
+                    } else if (PbetaDecay(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case -1:
-                    if(Emmision(decaysList, EMHadronDefinition.hadron_p1)) {
+                    if (Emmision(decaysList, EMHadronDefinition.hadron_p1)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case 0:
-                    if(alphaDecay(decaysList)) {
+                    if (alphaDecay(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case 1:
-                    if(Emmision(decaysList, EMHadronDefinition.hadron_n1)) {
+                    if (Emmision(decaysList, EMHadronDefinition.hadron_n1)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 case 2:
-                    if(MbetaDecay(decaysList)) {
+                    if (MbetaDecay(decaysList)) {
                         return decaysList.toArray(EMDecay.NO_PRODUCT);
                     }
                     break;
                 default:
-                    if(decayMode>8){
-                        if(iaeaDecay(decaysList,0)) {
+                    if (decayMode > 8) {
+                        if (iaeaDecay(decaysList, 0)) {
                             return decaysList.toArray(EMDecay.NO_PRODUCT);
                         }
-                        return getDecayArray(decaysList,decayMode- BYTE_OFFSET,false);
+                        return getDecayArray(decaysList, decayMode - BYTE_OFFSET, false);
                     }
             }
             return EMDecay.NO_DECAY;
-        }else if(getMatterType() ==-1){
-            EMAtomDefinition anti =getAnti();
-            if(anti!=null) {
+        } else if (getGeneration() == -1) {
+            EMAtomDefinition anti = getAnti();
+            if (anti != null) {
                 return anti.getDecayArray(decaysList, decayMode, false);
             }
         }
         return getNaturalDecayInstant();
     }
 
-    private boolean iaeaDecay(ArrayList<EMDecay> decaysList, long energy){
+    private boolean iaeaDecay(ArrayList<EMDecay> decaysList, long energy) {
         EMNuclideIAEA.energeticState state;
-        if(energy> getIaea().getEnergeticStatesArray().length) {
+        if (energy > getIaea().getEnergeticStatesArray().length) {
             state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
-        } else if(energy<=0) {
+        } else if (energy <= 0) {
             state = getIaea().getEnergeticStatesArray()[0];
         } else {
             state = getIaea().getEnergeticStatesArray()[(int) energy];
         }
-        for (int i=0;i<state.decaymodes.length;i++){
-            if(!getDecayFromIaea(decaysList,state.decaymodes[i],energy)) {
+        for (int i = 0; i < state.decaymodes.length; i++) {
+            if (!getDecayFromIaea(decaysList, state.decaymodes[i], energy)) {
                 decaysList.clear();
                 return false;
             }
@@ -474,511 +470,553 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         return !decaysList.isEmpty();
     }
 
-    private boolean getDecayFromIaea(ArrayList<EMDecay> decaysList, EMNuclideIAEA.iaeaDecay decay, long energy){
-        EMDefinitionStackMap withThis =elementalStacks.toMutable(), newStuff =new EMDefinitionStackMap();
-        switch (decay.decayName){
+    private boolean getDecayFromIaea(ArrayList<EMDecay> decaysList, EMNuclideIAEA.iaeaDecay decay, long energy) {
+        EMDefinitionStackMap withThis = elementalStacks.toMutable(), newStuff = new EMDefinitionStackMap();
+        switch (decay.decayName) {
             case "D": {
-                if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(deuterium.getDefinition().getSubParticles())) {
                     withThis.putReplace(deuterium);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "3H": {
-                if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(tritium.getDefinition().getSubParticles())) {
                     withThis.putReplace(tritium);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "3HE": {
-                if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(helium_3.getDefinition().getSubParticles())) {
                     withThis.putReplace(helium_3);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "8BE": {
-                if (withThis.removeAllAmountsExact(beryllium_8.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(beryllium_8.getDefinition().getSubParticles())) {
                     withThis.putReplace(beryllium_8);
-                    decaysList.add(new EMDecay(decay.chance,withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                    decaysList.add(new EMDecay(decay.chance, withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                     return true;
                 }
-            } break;
+            }
+            break;
             case "14C": {
-                if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(carbon_14.getDefinition().getSubParticles())) {
                     newStuff.putReplace(carbon_14);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "24NE": {
-                if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(neon_24.getDefinition().getSubParticles())) {
                     newStuff.putReplace(neon_24);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "34SI": {
-                if (withThis.removeAllAmountsExact(silicon_34.getDefinition().getSubParticles())){
+                if (withThis.removeAllAmountsExact(silicon_34.getDefinition().getSubParticles())) {
                     newStuff.putReplace(silicon_34);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "A": case "A?": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)){
+            }
+            break;
+            case "A":
+            case "A?": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2, EMHadronDefinition.hadron_p2)) {
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_2);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2B-": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e2);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "EC": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2EC": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "B++EC": case "EC+B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+            }
+            break;
+            case "B++EC":
+            case "EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+A": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3, EMHadronDefinition.hadron_n1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B+2P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p3)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-A": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3, EMHadronDefinition.hadron_p1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(EMHadronDefinition.hadron_n1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-2N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n3)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(EMHadronDefinition.hadron_n2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "B-P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "ECA": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1, EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)) {
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(alpha);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "ECP": {
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p2)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "EC2P": {
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1, EMHadronDefinition.hadron_p3)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMHadronDefinition.hadron_p2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "ECP+EC2P": {//todo look at branching ratios
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e2, EMHadronDefinition.hadron_p5)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
                     newStuff.putReplace(EMHadronDefinition.hadron_p3);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_n1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2N": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n2)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_n2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_p1);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "2P": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2)) {
                     newStuff.putReplace(EMHadronDefinition.hadron_p2);
-                    try{
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "SF": {
                 if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                     return true;
                 }
-            } break;
+            }
+            break;
             case "B-F": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_n1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_p1);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "ECF": case "ECSF": case "EC(+SF)": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)){
+            }
+            break;
+            case "ECF":
+            case "ECSF":
+            case "EC(+SF)": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p1, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "SF(+EC+B+)": case "SF+EC+B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+            }
+            break;
+            case "SF(+EC+B+)":
+            case "SF+EC+B+": {
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "SF+EC+B-": {
-                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)){
+                if (withThis.removeAllAmountsExact(EMLeptonDefinition.lepton_e1)) {
                     newStuff.putReplace(EMLeptonDefinition.lepton_e1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve_1);
-                    try{
-                        if(Fission(decaysList,withThis,newStuff,decay.chance,false)) {
+                    try {
+                        if (Fission(decaysList, withThis, newStuff, decay.chance, false)) {
                             return true;
                         }
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
-            case "IT": case "IT?": case "G": {
-                if(energy>0){
+            }
+            break;
+            case "IT":
+            case "IT?":
+            case "G": {
+                if (energy > 0) {
                     decaysList.add(new EMDecay(decay.chance, this, boson_Y__));
-                }else{
-                    if(DEBUG_MODE) {
+                } else {
+                    if (DEBUG_MODE) {
                         TecTech.LOGGER.info("Tried to emit Gamma from ground state");
                     }
                     decaysList.add(new EMDecay(decay.chance, this));
@@ -986,28 +1024,30 @@ public final class EMAtomDefinition extends EMComplexTemplate {
                 return true;
             } //break;
             case "IT+EC+B+": {
-                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)){
+                if (withThis.removeAllAmountsExact(EMHadronDefinition.hadron_p2, EMLeptonDefinition.lepton_e1)) {
                     withThis.putUnifyExact(EMHadronDefinition.hadron_n2);
                     newStuff.putReplace(EMLeptonDefinition.lepton_e_1);
                     newStuff.putReplace(EMNeutrinoDefinition.lepton_Ve2);
-                    newStuff.putReplace(EMBosonDefinition.boson_Y__1);
-                    try{
+                    newStuff.putReplace(EMGaugeBosonDefinition.boson_Y__1);
+                    try {
                         newStuff.putReplace(new EMAtomDefinition(withThis.toImmutable_optimized_unsafe_LeavesExposedElementalTree()).getStackForm(1));
-                        decaysList.add(new EMDecay(decay.chance,newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
+                        decaysList.add(new EMDecay(decay.chance, newStuff.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
                         return true;
-                    }catch (Exception e){
-                        if(DEBUG_MODE) {
+                    } catch (Exception e) {
+                        if (DEBUG_MODE) {
                             e.printStackTrace();
                         }
                     }
                 }
-            } break;
+            }
+            break;
             case "DEAD_END":
                 decaysList.add(deadEnd);
                 return true;
-            default: throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + getNeutralCount() + ' ' + getElement());
+            default:
+                throw new Error("Unsupported decay mode: " + decay.decayName + ' ' + getNeutralCount() + ' ' + getElement());
         }
-        if(DEBUG_MODE) {
+        if (DEBUG_MODE) {
             TecTech.LOGGER.info("Failed to decay " + getElement() + ' ' + getNeutralCount() + ' ' + decay.decayName);
         }
         return false;
@@ -1093,48 +1133,48 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     private boolean Fission(ArrayList<EMDecay> decaysList, EMDefinitionStackMap fissile, EMDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
         EMDefinitionStackMap heavy      = new EMDefinitionStackMap();
-        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement())<=97);
+        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement()) <= 97);
 
-        for(EMDefinitionStack stack: fissile.valuesToArray()){
-            if(spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
-                    (stack.getAmount() <=80 || stack.getAmount() <90 && XSTR_INSTANCE.nextInt(10)< stack.getAmount() -80)) {
+        for (EMDefinitionStack stack : fissile.valuesToArray()) {
+            if (spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
+                    (stack.getAmount() <= 80 || stack.getAmount() < 90 && XSTR_INSTANCE.nextInt(10) < stack.getAmount() - 80)) {
                 return false;
             }
-            if(stack.getDefinition().getCharge()==0){
+            if (stack.getDefinition().getCharge() == 0) {
                 //if(stack.definition instanceof dHadronDefinition){
-                    double neutrals= stack.getAmount() *liquidDrop[2];
-                    int neutrals_cnt=(int)Math.floor(neutrals);
-                    neutrals_cnt+=neutrals-neutrals_cnt>XSTR_INSTANCE.nextDouble()?1:0;
-                    particles.putUnifyExact(new EMDefinitionStack(stack.getDefinition(), neutrals_cnt));
-
-                    int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[1]);
-                    while(heavy_cnt+neutrals_cnt> stack.getAmount()) {
-                        heavy_cnt--;
-                    }
-                    fissile.removeAmountExact(new EMDefinitionStack(stack.getDefinition(),heavy_cnt+neutrals_cnt));
-                    heavy.putReplace(new EMDefinitionStack(stack.getDefinition(), heavy_cnt));
+                double neutrals     = stack.getAmount() * liquidDrop[2];
+                int    neutrals_cnt = (int) Math.floor(neutrals);
+                neutrals_cnt += neutrals - neutrals_cnt > XSTR_INSTANCE.nextDouble() ? 1 : 0;
+                particles.putUnifyExact(new EMDefinitionStack(stack.getDefinition(), neutrals_cnt));
+
+                int heavy_cnt = (int) Math.ceil(stack.getAmount() * liquidDrop[1]);
+                while (heavy_cnt + neutrals_cnt > stack.getAmount()) {
+                    heavy_cnt--;
+                }
+                fissile.removeAmountExact(new EMDefinitionStack(stack.getDefinition(), heavy_cnt + neutrals_cnt));
+                heavy.putReplace(new EMDefinitionStack(stack.getDefinition(), heavy_cnt));
                 //}else{
                 //    particles.add(stack);
                 //    light.remove(stack.definition);
                 //}
-            }else{
-                int heavy_cnt=(int)Math.ceil(stack.getAmount() *liquidDrop[0]);
-                if(heavy_cnt%2==1 && XSTR_INSTANCE.nextDouble()>0.05D) {
+            } else {
+                int heavy_cnt = (int) Math.ceil(stack.getAmount() * liquidDrop[0]);
+                if (heavy_cnt % 2 == 1 && XSTR_INSTANCE.nextDouble() > 0.05D) {
                     heavy_cnt--;
                 }
-                EMDefinitionStack new_stack =new EMDefinitionStack(stack.getDefinition(), heavy_cnt);
+                EMDefinitionStack new_stack = new EMDefinitionStack(stack.getDefinition(), heavy_cnt);
                 fissile.removeAmountExact(new_stack);
                 heavy.putReplace(new_stack);
             }
         }
 
         try {
-            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
-            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()),1));
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(fissile.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1));
+            particles.putReplace(new EMDefinitionStack(new EMAtomDefinition(heavy.toImmutable_optimized_unsafe_LeavesExposedElementalTree()), 1));
             decaysList.add(new EMDecay(probability, particles.toImmutable_optimized_unsafe_LeavesExposedElementalTree()));
             return true;
         } catch (Exception e) {
-            if(DEBUG_MODE) {
+            if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
@@ -1181,51 +1221,51 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
         if (iaeaDefinitionExistsAndHasEnergyLevels) {
-            ArrayList<EMDecay> decays =new ArrayList<>(4);
-            if(iaeaDecay(decays,energyLevel)){
+            ArrayList<EMDecay> decays = new ArrayList<>(4);
+            if (iaeaDecay(decays, energyLevel)) {
                 return decays.toArray(EMDecay.NO_PRODUCT);
             }
         }
-        if(energyLevel< Math.abs(getCharge())/3+ getNeutralCount()) {
+        if (energyLevel < Math.abs(getCharge()) / 3 + getNeutralCount()) {
             return new EMDecay[]{new EMDecay(1, this, boson_Y__)};
         }
         return getNaturalDecayInstant();
     }
 
     @Override
-    public double getEnergyDiffBetweenStates(long currentEnergyLevel,long newEnergyLevel) {
-        if(iaeaDefinitionExistsAndHasEnergyLevels){
-            double result=0;
-            boolean backwards=newEnergyLevel<currentEnergyLevel;
-            if(backwards){
-                long temp=currentEnergyLevel;
-                currentEnergyLevel=newEnergyLevel;
-                newEnergyLevel=temp;
-            }
-
-            if(currentEnergyLevel<=0){
-                if(newEnergyLevel<=0) {
+    public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
+        if (iaeaDefinitionExistsAndHasEnergyLevels) {
+            double  result    = 0;
+            boolean backwards = newEnergyLevel < currentEnergyLevel;
+            if (backwards) {
+                long temp = currentEnergyLevel;
+                currentEnergyLevel = newEnergyLevel;
+                newEnergyLevel = temp;
+            }
+
+            if (currentEnergyLevel <= 0) {
+                if (newEnergyLevel <= 0) {
                     return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
                 } else {
                     result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * -currentEnergyLevel;
                 }
-            }else {
+            } else {
                 result -= getIaea().getEnergeticStatesArray()[(int) Math.min(getIaea().getEnergeticStatesArray().length - 1, currentEnergyLevel)].energy;
             }
-            if(newEnergyLevel>= getIaea().getEnergeticStatesArray().length){
-                if(currentEnergyLevel>= getIaea().getEnergeticStatesArray().length) {
+            if (newEnergyLevel >= getIaea().getEnergeticStatesArray().length) {
+                if (currentEnergyLevel >= getIaea().getEnergeticStatesArray().length) {
                     return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
                 } else {
                     result += IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - getIaea().getEnergeticStatesArray().length + 1);
                 }
-                result+= getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length-1].energy;
-            }else {
+                result += getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1].energy;
+            } else {
                 result += getIaea().getEnergeticStatesArray()[(int) newEnergyLevel].energy;
             }
 
-            return backwards?-result:result;
+            return backwards ? -result : result;
         }
-        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
     }
 
     @Override
@@ -1235,17 +1275,17 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public boolean usesMultipleDecayCalls(long energyLevel) {
-        if(!iaeaDefinitionExistsAndHasEnergyLevels) return false;
+        if (!iaeaDefinitionExistsAndHasEnergyLevels) return false;
         EMNuclideIAEA.energeticState state;
-        if(energyLevel> getIaea().getEnergeticStatesArray().length) {
+        if (energyLevel > getIaea().getEnergeticStatesArray().length) {
             state = getIaea().getEnergeticStatesArray()[getIaea().getEnergeticStatesArray().length - 1];
-        } else if(energyLevel<=0) {
+        } else if (energyLevel <= 0) {
             state = getIaea().getEnergeticStatesArray()[0];
         } else {
             state = getIaea().getEnergeticStatesArray()[(int) energyLevel];
         }
-        for (EMNuclideIAEA.iaeaDecay decay:state.decaymodes){
-            if(decay.decayName.contains("F")) return true;//if is fissile
+        for (EMNuclideIAEA.iaeaDecay decay : state.decaymodes) {
+            if (decay.decayName.contains("F")) return true;//if is fissile
         }
         return false;
     }
@@ -1257,7 +1297,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public boolean fusionMakesEnergy(long energyLevel) {
-        return getIaea() !=null || iaeaDefinitionExistsAndHasEnergyLevels;
+        return getIaea() != null || iaeaDefinitionExistsAndHasEnergyLevels;
     }
 
     @Override
@@ -1265,7 +1305,7 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         //disembody
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack elementalStack : elementalStacks.valuesToArray()) {
-            if (elementalStack.getDefinition().getMatterType() == 1 || elementalStack.getDefinition().getMatterType() == -1) {
+            if (elementalStack.getDefinition().getGeneration() == 1 || elementalStack.getDefinition().getGeneration() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(elementalStack);
             } else {
@@ -1278,10 +1318,10 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     //@Override
     //public iElementalDefinition getAnti() {
-    //    cElementalDefinitionStack[] stacks = this.elementalStacks.values();
-    //    cElementalDefinitionStack[] antiElements = new cElementalDefinitionStack[stacks.length];
+    //    EMDefinitionStack[] stacks = this.elementalStacks.values();
+    //    EMDefinitionStack[] antiElements = new EMDefinitionStack[stacks.length];
     //    for (int i = 0; i < antiElements.length; i++) {
-    //        antiElements[i] = new cElementalDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
+    //        antiElements[i] = new EMDefinitionStack(stacks[i].definition.getAnti(), stacks[i].amount);
     //    }
     //    try {
     //        return new dAtomDefinition(false, antiElements);
@@ -1307,21 +1347,6 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
     }
 
-    @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return EMTransformationInfo.TRANSFORMATION_INFO.getFluidDequantization().get(this);
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return EMTransformationInfo.TRANSFORMATION_INFO.getItemDequantization().get(this);
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return EMTransformationInfo.TRANSFORMATION_INFO.getOredictDequantization().get(this);
-    }
-
     public EMNuclideIAEA getIaea() {
         return iaea;
     }
@@ -1339,55 +1364,43 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     private static final class Nomenclature {
-        private static final String[] SYMBOL = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
-        private static final String[] NAME = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+        private static final String[] SYMBOL       = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
+        private static final String[] NAME         = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
         private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
     }
 
     @Override
-    protected int getIndirectTagValue() {
+    protected String getIndirectTagValue() {
         return nbtType;
     }
 
-    public static EMAtomDefinition fromNBT(NBTTagCompound nbt) {
-        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new EMAtomDefinition(stacks);
-        } catch (EMException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(nbtType, new EMIndirectType((definitionsRegistry, nbt) ->
+                new EMAtomDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), EMAtomDefinition.class, "tt.keyword.Element"));
+        EMNuclideIAEA.run();
 
-    public static void run() {
         for (Runnable r : overrides) {
             r.run();
         }
 
-        for(Map.Entry<EMAtomDefinition,Double> entry:lifetimeOverrides.entrySet()){
+        for (Map.Entry<EMAtomDefinition, Double> entry : lifetimeOverrides.entrySet()) {
             try {
                 lifetimeOverrides.put(new EMAtomDefinition(entry.getKey().elementalStacks), entry.getValue());
-            }catch (EMException e){
+            } catch (EMException e) {
                 e.printStackTrace(); //Impossible
             }
         }
 
         //populate stable isotopes
-        for (int element = 1; element < 83; element++)//Up to Bismuth exclusive
-        {
+        for (int element = 1; element < 83; element++) {//Up to Bismuth exclusive
             for (int isotope = 0; isotope < 130; isotope++) {
                 xstr.setSeed((long) (element + 1) * (isotope + 100));
                 //stability curve
-                int StableIsotope = stableIzoCurve(element);
-                int izoDiff = isotope - StableIsotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double        rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                EMNuclideIAEA nuclide     = EMNuclideIAEA.get(element, isotope);
+                int           StableIsotope = stableIzoCurve(element);
+                int           izoDiff       = isotope - StableIsotope;
+                int           izoDiffAbs    = Math.abs(izoDiff);
+                double        rawLifeTime   = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                EMNuclideIAEA nuclide       = EMNuclideIAEA.get(element, isotope);
                 if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.getHalfTime() >= STABLE_RAW_LIFE_TIME) {
                     TreeSet<Integer> isotopes = stableIsotopes.computeIfAbsent(element, k -> new TreeSet<>());
                     isotopes.add(isotope);
@@ -1396,16 +1409,16 @@ public final class EMAtomDefinition extends EMComplexTemplate {
         }
 
         //populate unstable isotopes
-        for (int element = 83; element < 150; element++) {
+        for (int element = 1; element < 150; element++) {
             for (int isotope = 100; isotope < 180; isotope++) {
                 xstr.setSeed((long) (element + 1) * (isotope + 100));
                 //stability curve
-                int Isotope = stableIzoCurve(element);
-                int izoDiff = isotope - Isotope;
-                int izoDiffAbs = Math.abs(izoDiff);
-                double rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
-                TreeMap<Double, Integer> isotopes = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
-                isotopes.put(rawLifeTime, isotope);
+                int                      Isotope     = stableIzoCurve(element);
+                int                      izoDiff     = isotope - Isotope;
+                int                      izoDiffAbs  = Math.abs(izoDiff);
+                double                   rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
+                TreeMap<Double, Integer> isotopes    = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
+                isotopes.put(rawLifeTime, isotope);//todo dont add stable ones
             }
         }
 
@@ -1428,213 +1441,221 @@ public final class EMAtomDefinition extends EMComplexTemplate {
                     TecTech.LOGGER.info("Added Unstable Atom:" + integerTreeMapEntry.getKey() + ' ' + integerTreeMapEntry.getValue().lastEntry().getValue() + ' ' + unstableAtoms.get(integerTreeMapEntry.getKey()).getMass());
                 }
             }
-            deuterium=new EMAtomDefinition(
+
+            deuterium = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p1,
                     EMHadronDefinition.hadron_n1,
                     EMLeptonDefinition.lepton_e1).getStackForm(1);
-            tritium=new EMAtomDefinition(
+            registry.registerForDisplay(deuterium.getDefinition());
+
+            tritium = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p1,
                     EMHadronDefinition.hadron_n2,
                     EMLeptonDefinition.lepton_e1).getStackForm(1);
-            helium_3=new EMAtomDefinition(
+            registry.registerForDisplay(tritium.getDefinition());
+
+            helium_3 = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p2,
                     EMHadronDefinition.hadron_n1,
                     EMLeptonDefinition.lepton_e2).getStackForm(1);
+            registry.registerForDisplay(helium_3.getDefinition());
+
             alpha = new EMAtomDefinition(
                     EMHadronDefinition.hadron_p2,
                     EMHadronDefinition.hadron_n2).getStackForm(1);
-            beryllium_8=new EMAtomDefinition(
+            registry.registerForDisplay(alpha.getDefinition());
+
+            beryllium_8 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 4),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 4),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 4)).getStackForm(1);
-            carbon_14=new EMAtomDefinition(
+            registry.registerForDisplay(beryllium_8.getDefinition());
+
+            carbon_14 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 6),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 8),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 6)).getStackForm(1);
-            neon_24=new EMAtomDefinition(
+            registry.registerForDisplay(carbon_14.getDefinition());
+
+            neon_24 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 10),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 14),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 10)).getStackForm(1);
-            silicon_34=new EMAtomDefinition(
+            registry.registerForDisplay(neon_24.getDefinition());
+
+            silicon_34 = new EMAtomDefinition(
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 14),
                     new EMDefinitionStack(EMHadronDefinition.hadron_n, 20),
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 14)).getStackForm(1);
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-
-        try {
-            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMAtomDefinition::fromNBT,EMAtomDefinition.class,getClassTypeStatic());
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
-            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + getClassTypeStatic());
-        }
-    }
-
-    public static void setTransformations(){
-        /*----STABLE ATOMS----**/
-        refMass = getFirstStableIsotope(1).getMass() * AVOGADRO_CONSTANT_144;
-
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(1), AVOGADRO_CONSTANT_144),Materials.Hydrogen.mGas,144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(2), AVOGADRO_CONSTANT_144),Materials.Helium.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(3), AVOGADRO_CONSTANT_144), dust, Materials.Lithium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(4), AVOGADRO_CONSTANT_144), dust, Materials.Beryllium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(5), AVOGADRO_CONSTANT_144), dust, Materials.Boron,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(6), AVOGADRO_CONSTANT_144), dust, Materials.Carbon,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(7), AVOGADRO_CONSTANT_144),Materials.Nitrogen.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(8), AVOGADRO_CONSTANT_144),Materials.Oxygen.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(9), AVOGADRO_CONSTANT_144),Materials.Fluorine.mGas, 144);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Materials.Neon.mGas.getID(), 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(11), AVOGADRO_CONSTANT_144), dust, Materials.Sodium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(12), AVOGADRO_CONSTANT_144), dust, Materials.Magnesium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(13), AVOGADRO_CONSTANT_144), dust, Materials.Aluminium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(14), AVOGADRO_CONSTANT_144), dust, Materials.Silicon,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(15), AVOGADRO_CONSTANT_144), dust, Materials.Phosphorus,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(16), AVOGADRO_CONSTANT_144), dust, Materials.Sulfur,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(17), AVOGADRO_CONSTANT_144),Materials.Argon.mGas, 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(19), AVOGADRO_CONSTANT_144), dust, Materials.Potassium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(20), AVOGADRO_CONSTANT_144), dust, Materials.Calcium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(21), AVOGADRO_CONSTANT_144), dust, Materials.Scandium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(22), AVOGADRO_CONSTANT_144), dust, Materials.Titanium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(23), AVOGADRO_CONSTANT_144), dust, Materials.Vanadium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(24), AVOGADRO_CONSTANT_144), dust, Materials.Chrome,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(25), AVOGADRO_CONSTANT_144), dust, Materials.Manganese,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(26), AVOGADRO_CONSTANT_144), dust, Materials.Iron,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(27), AVOGADRO_CONSTANT_144), dust, Materials.Cobalt,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(28), AVOGADRO_CONSTANT_144), dust, Materials.Nickel,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(29), AVOGADRO_CONSTANT_144), dust, Materials.Copper,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(30), AVOGADRO_CONSTANT_144), dust, Materials.Zinc,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(31), AVOGADRO_CONSTANT_144), dust, Materials.Gallium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Germanium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(33), AVOGADRO_CONSTANT_144), dust, Materials.Arsenic,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Selenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Bromine,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Krypton,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(37), AVOGADRO_CONSTANT_144), dust, Materials.Rubidium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(38), AVOGADRO_CONSTANT_144), dust, Materials.Strontium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(39), AVOGADRO_CONSTANT_144), dust, Materials.Yttrium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Zirconium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(41), AVOGADRO_CONSTANT_144), dust, Materials.Niobium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(42), AVOGADRO_CONSTANT_144), dust, Materials.Molybdenum,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Technetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Ruthenium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhodium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(46), AVOGADRO_CONSTANT_144), dust, Materials.Palladium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(47), AVOGADRO_CONSTANT_144), dust, Materials.Silver,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(48), AVOGADRO_CONSTANT_144), dust, Materials.Cadmium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(49), AVOGADRO_CONSTANT_144), dust, Materials.Indium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(50), AVOGADRO_CONSTANT_144), dust, Materials.Tin,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(51), AVOGADRO_CONSTANT_144), dust, Materials.Antimony,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(52), AVOGADRO_CONSTANT_144), dust, Materials.Tellurium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Iodine,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Materials.Xenon.mGas.getID(), 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(55), AVOGADRO_CONSTANT_144), dust, Materials.Caesium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(56), AVOGADRO_CONSTANT_144), dust, Materials.Barium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(57), AVOGADRO_CONSTANT_144), dust, Materials.Lanthanum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(58), AVOGADRO_CONSTANT_144), dust, Materials.Cerium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(59), AVOGADRO_CONSTANT_144), dust, Materials.Praseodymium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(60), AVOGADRO_CONSTANT_144), dust, Materials.Neodymium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(61), AVOGADRO_CONSTANT_144), dust, Materials.Promethium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(62), AVOGADRO_CONSTANT_144), dust, Materials.Samarium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(63), AVOGADRO_CONSTANT_144), dust, Materials.Europium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(64), AVOGADRO_CONSTANT_144), dust, Materials.Gadolinium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(65), AVOGADRO_CONSTANT_144), dust, Materials.Terbium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(66), AVOGADRO_CONSTANT_144), dust, Materials.Dysprosium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(67), AVOGADRO_CONSTANT_144), dust, Materials.Holmium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(68), AVOGADRO_CONSTANT_144), dust, Materials.Erbium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(69), AVOGADRO_CONSTANT_144), dust, Materials.Thulium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(70), AVOGADRO_CONSTANT_144), dust, Materials.Ytterbium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(71), AVOGADRO_CONSTANT_144), dust, Materials.Lutetium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Hafnum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(73), AVOGADRO_CONSTANT_144), dust, Materials.Tantalum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(74), AVOGADRO_CONSTANT_144), dust, Materials.Tungsten,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Rhenium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(76), AVOGADRO_CONSTANT_144), dust, Materials.Osmium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(77), AVOGADRO_CONSTANT_144), dust, Materials.Iridium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(78), AVOGADRO_CONSTANT_144), dust, Materials.Platinum,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(79), AVOGADRO_CONSTANT_144), dust, Materials.Gold,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getFirstStableIsotope(80), AVOGADRO_CONSTANT_144),Materials.Mercury.mFluid, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Thallium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getFirstStableIsotope(82), AVOGADRO_CONSTANT_144), dust, Materials.Lead,1);
-
-        /*----UNSTABLE ATOMS----**/
-        refUnstableMass = getFirstStableIsotope(82).getMass() * AVOGADRO_CONSTANT_144;
-
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(83), AVOGADRO_CONSTANT_144), dust, Materials.Bismuth,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Polonium,1);
-        //transformation.addFluid(new cElementalDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Materials.Astatine.mPlasma.getID(), 144);
-        EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(getBestUnstableIsotope(86), AVOGADRO_CONSTANT_144),Materials.Radon.mGas, 144);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Francium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Radium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Actinium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(90), AVOGADRO_CONSTANT_144), dust, Materials.Thorium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Protactinium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Materials.Uranium,1);
-        //transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),OrePrefixes.dust, Materials.Neptunium,1);
-        ////transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Materials.Plutonium,1);
-        EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(getBestUnstableIsotope(95), AVOGADRO_CONSTANT_144), dust, Materials.Americium,1);
-
-        try {
-            EMAtomDefinition temp;
-            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(deuterium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Deuterium.mGas, 144);
-
-            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(tritium.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Tritium.mGas, 144);
+            registry.registerForDisplay(silicon_34.getDefinition());
 
-            EMTransformationInfo.TRANSFORMATION_INFO.addFluid(new EMDefinitionStack(helium_3.getDefinition(), AVOGADRO_CONSTANT_144),Materials.Helium_3.mGas, 144);
-
-            temp=new EMAtomDefinition(
+            uranium_238 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium/*238*/,1);
-
-            double tempMass=temp.getMass();
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 146)).getStackForm(1);
+            registry.registerForDisplay(uranium_238.getDefinition());
 
-            temp=new EMAtomDefinition(
+            uranium_235 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 92),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 92),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Uranium235,1);
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 143)).getStackForm(1);
+            registry.registerForDisplay(uranium_235.getDefinition());
 
-            TecTech.LOGGER.info("Diff Mass U : "+(tempMass-temp.getMass()));
+            TecTech.LOGGER.info("Diff Mass U : " + (uranium_238.getDefinition().getMass() - uranium_235.getDefinition().getMass()));
 
-            temp=new EMAtomDefinition(
+            plutonium_239 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(temp, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium/*239*/,1);
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 145)).getStackForm(1);
+            registry.registerForDisplay(plutonium_239.getDefinition());
 
-            somethingHeavy=new EMAtomDefinition(
+            plutonium_241 = new EMAtomDefinition(
                     new EMDefinitionStack(EMLeptonDefinition.lepton_e, 94),
                     new EMDefinitionStack(EMHadronDefinition.hadron_p, 94),
-                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)
-            );
-            EMTransformationInfo.TRANSFORMATION_INFO.addOredict(new EMDefinitionStack(somethingHeavy, AVOGADRO_CONSTANT_144), dust, Materials.Plutonium241,1);
+                    new EMDefinitionStack(EMHadronDefinition.hadron_n, 147)).getStackForm(1);
+            registry.registerForDisplay(plutonium_241.getDefinition());
 
-            TecTech.LOGGER.info("Diff Mass Pu: "+(somethingHeavy.getMass()-temp.getMass()));
+            TecTech.LOGGER.info("Diff Mass Pu: " + (plutonium_241.getDefinition().getMass() - plutonium_239.getDefinition().getMass()));
 
-            TecTech.LOGGER.info("Neutron Mass: "+ EMHadronDefinition.hadron_n.getMass());
+            somethingHeavy=(EMAtomDefinition) plutonium_241.getDefinition();
 
-        } catch (EMException e) {
+        } catch (Exception e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
             }
         }
 
-        if(Loader.isModLoaded(Reference.GTPLUSPLUS)) {
-            new GtppAtomLoader().run();
+        if (DEBUG_MODE) {
+            TecTech.LOGGER.info("Registered Elemental Matter Class: Atom " + nbtType + ' ' + getClassTypeStatic());
+        }
+
+        for (int i = 1; i <= 118; i++) {
+            EMAtomDefinition firstStableIsotope = getFirstStableIsotope(i);
+            if(firstStableIsotope==null){
+                firstStableIsotope = getBestUnstableIsotope(i);
+                if(firstStableIsotope==null){
+                    continue;
+                }
+            }
+            registry.registerForDisplay(firstStableIsotope);
         }
     }
 
+    public static void setTransformations(EMTransformationRegistry transformationInfo) {
+        /*----STABLE ATOMS----**/
+        refMass = getFirstStableIsotope(1).getMass() * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(1), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Hydrogen.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(2), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Helium.mGas, 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(3), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lithium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(4), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Beryllium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(5), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Boron, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(6), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Carbon, 1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(7), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Nitrogen.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(8), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Oxygen.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(9), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Fluorine.mGas, 144);
+        //transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(10), AVOGADRO_CONSTANT_144),Neon.mGas.getID(), 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(11), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Sodium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(12), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Magnesium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(13), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Aluminium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(14), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Silicon, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(15), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Phosphorus, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(16), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Sulfur, 1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(17), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Argon.mGas, 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(19), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Potassium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(20), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Calcium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(21), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Scandium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(22), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Titanium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(23), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Vanadium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(24), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Chrome, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(25), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Manganese, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(26), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Iron, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(27), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Cobalt, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(28), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Nickel, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(29), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Copper, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(30), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Zinc, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(31), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Gallium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(32), AVOGADRO_CONSTANT_144),dust, Germanium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(33), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Arsenic, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(34), AVOGADRO_CONSTANT_144),dust, Selenium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(35), AVOGADRO_CONSTANT_144),dust, Bromine,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(36), AVOGADRO_CONSTANT_144),dust, Krypton,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(37), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Rubidium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(38), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Strontium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(39), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Yttrium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(40), AVOGADRO_CONSTANT_144),dust, Zirconium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(41), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Niobium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(42), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Molybdenum, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(43), AVOGADRO_CONSTANT_144),dust, Technetium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(44), AVOGADRO_CONSTANT_144),dust, Ruthenium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(45), AVOGADRO_CONSTANT_144),dust, Rhodium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(46), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Palladium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(47), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Silver, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(48), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Cadmium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(49), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Indium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(50), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tin, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(51), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Antimony, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(52), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tellurium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(53), AVOGADRO_CONSTANT_144),dust, Iodine,1);
+        //transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(54), AVOGADRO_CONSTANT_144),Xenon.mGas.getID(), 144);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(55), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Caesium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(56), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Barium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(57), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lanthanum, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(58), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Cerium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(59), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Praseodymium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(60), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Neodymium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(62), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Samarium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(63), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Europium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(64), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Gadolinium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(65), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Terbium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(66), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Dysprosium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(67), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Holmium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(68), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Erbium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(69), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Thulium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(70), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Ytterbium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(71), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lutetium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(72), AVOGADRO_CONSTANT_144),dust, Hafnum,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(73), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tantalum, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(74), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Tungsten, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(75), AVOGADRO_CONSTANT_144),dust, Rhenium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(76), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Osmium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(77), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Iridium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(78), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Platinum, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(79), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Gold, 1);
+        transformationInfo.addFluid(new EMDefinitionStack(getFirstStableIsotope(80), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Mercury.mFluid, 144);
+        //transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(81), AVOGADRO_CONSTANT_144),dust, Thallium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getFirstStableIsotope(82), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Lead, 1);
+
+        /*----UNSTABLE ATOMS----**/
+        refUnstableMass = getFirstStableIsotope(82).getMass() * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(61), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Promethium, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(83), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Bismuth, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(84),AVOGADRO_CONSTANT_144),dust, Polonium,1);
+        //transformationInfo.addFluid(new EMDefinitionStack(getBestUnstableIsotope(85),AVOGADRO_CONSTANT_144),Astatine.mPlasma.getID(), 144);
+        transformationInfo.addFluid(new EMDefinitionStack(getBestUnstableIsotope(86), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Radon.mGas, 144);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(87),AVOGADRO_CONSTANT_144),dust, Francium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(88),AVOGADRO_CONSTANT_144),dust, Radium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(89),AVOGADRO_CONSTANT_144),dust, Actinium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(90), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Thorium, 1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(91),AVOGADRO_CONSTANT_144),dust, Protactinium,1);
+        ////transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(92),AVOGADRO_CONSTANT_144), dust, Uranium,1);
+        //transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(93),AVOGADRO_CONSTANT_144),dust, Neptunium,1);
+        ////transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(94),AVOGADRO_CONSTANT_144), dust, Plutonium,1);
+        transformationInfo.addOredict(new EMDefinitionStack(getBestUnstableIsotope(95), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Americium, 1);
+
+
+        transformationInfo.addFluid(new EMDefinitionStack(deuterium.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Deuterium.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(tritium.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Tritium.mGas, 144);
+        transformationInfo.addFluid(new EMDefinitionStack(helium_3.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), Helium_3.mGas, 144);
+
+        transformationInfo.addOredict(new EMDefinitionStack(uranium_238.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Uranium/*238*/, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(uranium_235.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Uranium235, 1);
+
+        transformationInfo.addOredict(new EMDefinitionStack(plutonium_239.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Plutonium/*239*/, 1);
+        transformationInfo.addOredict(new EMDefinitionStack(plutonium_241.getDefinition(), EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED), dust, Plutonium241, 1);
+    }
+
     public static EMAtomDefinition getFirstStableIsotope(int element) {
         return stableAtoms.get(element);
     }
@@ -1644,11 +1665,11 @@ public final class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public byte getClassType() {
+    public int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic(){
+    public static int getClassTypeStatic() {
         return 64;
     }
 
@@ -1659,36 +1680,36 @@ public final class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
+        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+ getLocalizedName());
-            lines.add("SYMBOL = "+getSymbol());
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = " + getLocalizedName());
+            lines.add("SYMBOL = " + getSymbol());
         }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
         }
-        if(iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES,capabilities)){
-            for(int i = 1; i< getIaea().getEnergeticStatesArray().length; i++){
-                lines.add("E LEVEL "+i+" = "+ getIaea().getEnergeticStatesArray()[i].energy+" eV");
+        if (iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES, capabilities)) {
+            for (int i = 1; i < getIaea().getEnergeticStatesArray().length; i++) {
+                lines.add("E LEVEL " + i + " = " + getIaea().getEnergeticStatesArray()[i].energy + " eV");
             }
         }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("HALF LIFE = " + getRawTimeSpan(energyLevel) + " s");
             lines.add("    At current energy level");
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index c1db8e4460..aedb11ac05 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -4,21 +4,20 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictQuantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.OreDictionaryStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
 import com.github.technus.tectech.util.Util;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
@@ -26,29 +25,28 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static gregtech.api.enums.OrePrefixes.dust;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 17.11.2016.
  */
-public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i/o
+public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i/o
     private final int hash;
 
-    private static final byte                           nbtType    = (byte) 'h';
+    private static final String                          nbtType              = "h";
     //Helpers
-    public static final  Map<EMHadronDefinition,String> SYMBOL_MAP =new HashMap<>();
-    public static final  Map<EMHadronDefinition,String> NAME_MAP   =new HashMap<>();
-    public static        EMHadronDefinition             hadron_p, hadron_n, hadron_p_, hadron_n_;
+    public static final  Map<EMHadronDefinition, String> SYMBOL_MAP           = new HashMap<>();
+    public static final  Map<EMHadronDefinition, String> UNLOCALIZED_NAME_MAP = new HashMap<>();
+    public static        EMHadronDefinition              hadron_p, hadron_n, hadron_p_, hadron_n_;
     public static EMDefinitionStack hadron_p1, hadron_n1, hadron_p2, hadron_n2, hadron_p3, hadron_n3, hadron_p5;
-    private static double protonMass = 0D;
-    private static double neutronMass = 0D;
-    private static final double actualProtonMass=938272081.3D;
-    private static final double actualNeutronMass=939565413.3D;
+    private static       double protonMass        = 0D;
+    private static       double neutronMass       = 0D;
+    private static final double actualProtonMass  = 938272081.3D;
+    private static final double actualNeutronMass = 939565413.3D;
 
     //float-mass in eV/c^2
     private final double mass;
@@ -81,20 +79,20 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         }
         quarkStacks = quarks;
 
-        int amount = 0;
-        int charge = 0;
-        int type = 0;
+        int     amount       = 0;
+        int     charge       = 0;
+        int     type         = 0;
         boolean containsAnti = false;
-        double mass = 0;
+        double  mass         = 0;
         for (EMDefinitionStack quarkStack : quarkStacks.valuesToArray()) {
             amount += quarkStack.getAmount();
-            if((int) quarkStack.getAmount() != quarkStack.getAmount()){
+            if ((int) quarkStack.getAmount() != quarkStack.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             mass += quarkStack.getMass();
             charge += quarkStack.getCharge();
-            type = Math.max(Math.abs(quarkStack.getDefinition().getMatterType()), type);
-            if (quarkStack.getDefinition().getMatterType() < 0) {
+            type = Math.max(Math.abs(quarkStack.getDefinition().getGeneration()), type);
+            if (quarkStack.getDefinition().getGeneration() < 0) {
                 containsAnti = true;
             }
         }
@@ -106,10 +104,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
         if (mass == protonMass && this.getAmount() == 3) {
             rawLifeTime = IEMDefinition.STABLE_RAW_LIFE_TIME;
-            mass=actualProtonMass;
+            mass = actualProtonMass;
         } else if (mass == neutronMass && this.getAmount() == 3) {
             rawLifeTime = 882D;
-            mass=actualNeutronMass;
+            mass = actualNeutronMass;
         } else {
             if (this.getAmount() == 3) {
                 rawLifeTime = 1.34D / mass * Math.pow(9.81, charge);
@@ -119,8 +117,8 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
                 rawLifeTime = 1.21D / mass / Math.pow(9.80, charge);
             }
         }
-        this.mass=mass;
-        hash=super.hashCode();
+        this.mass = mass;
+        hash = super.hashCode();
     }
 
     //public but u can just try{}catch(){} the constructor it still calls this method
@@ -130,7 +128,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             if (!(quarks.getDefinition() instanceof EMQuarkDefinition)) {
                 return false;
             }
-            if((int) quarks.getAmount() != quarks.getAmount()){
+            if ((int) quarks.getAmount() != quarks.getAmount()) {
                 throw new ArithmeticException("Amount cannot be safely converted to int!");
             }
             amount += quarks.getAmount();
@@ -140,12 +138,12 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public String getLocalizedName() {
-        StringBuilder name= new StringBuilder(getSimpleName());
+        StringBuilder name = new StringBuilder(getSimpleName());
         name.append(':');
-        String sym= translateToLocal(NAME_MAP.get(this));
-        if(sym!=null){
+        String sym = translateToLocal(UNLOCALIZED_NAME_MAP.get(this));
+        if (sym != null) {
             name.append(' ').append(sym);
-        }else {
+        } else {
             for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
                 name.append(' ').append(quark.getDefinition().getSymbol()).append((int) quark.getAmount());
             }
@@ -172,10 +170,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public String getSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
+        String sym = SYMBOL_MAP.get(this);
+        if (sym != null) {
             return sym;
-        }else {
+        } else {
             StringBuilder symbol = new StringBuilder(8);
             for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.getAmount(); i++) {
@@ -188,10 +186,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public String getShortSymbol() {
-        String sym=SYMBOL_MAP.get(this);
-        if(sym!=null){
+        String sym = SYMBOL_MAP.get(this);
+        if (sym != null) {
             return sym;
-        }else {
+        } else {
             StringBuilder symbol = new StringBuilder(8);
             for (EMDefinitionStack quark : quarkStacks.valuesToArray()) {
                 for (int i = 0; i < quark.getAmount(); i++) {
@@ -203,7 +201,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     }
 
     @Override
-    public byte getColor() {
+    public int getMaxColors() {
         return -7;
     }
 
@@ -215,12 +213,12 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     @Override
     public EMDecay[] getNaturalDecayInstant() {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) {
             return EMDecay.NO_PRODUCT;
         }
         ArrayList<EMDefinitionStack> decaysInto = new ArrayList<>();
         for (EMDefinitionStack quarks : quarkStacks) {
-            if (quarks.getDefinition().getMatterType() == 1 || quarks.getDefinition().getMatterType() == -1) {
+            if (quarks.getDefinition().getGeneration() == 1 || quarks.getDefinition().getGeneration() == -1) {
                 //covers both quarks and antiquarks
                 decaysInto.add(quarks);
             } else {
@@ -230,22 +228,22 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         }
         return new EMDecay[]{
                 new EMDecay(0.75D, decaysInto.toArray(new EMDefinitionStack[0])),
-                EMBosonDefinition.deadEnd
+                deadEnd
         };
     }
 
     @Override
     public EMDecay[] getEnergyInducedDecay(long energyLevel) {
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
-        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
+        if (getAmount() == 2 && quarkStacks.length == 2 && quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() && quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) {
             return EMDecay.NO_PRODUCT;
         }
-        return new EMDecay[]{new EMDecay(0.75D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+        return new EMDecay[]{new EMDecay(0.75D, quarkStacks), deadEnd}; //decay into quarks
     }
 
     @Override
     public double getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) {
-        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel);
+        return IEMDefinition.DEFAULT_ENERGY_REQUIREMENT * (newEnergyLevel - currentEnergyLevel);
     }
 
     @Override
@@ -273,10 +271,10 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         EMDefinitionStack[] quarkStacks = this.quarkStacks.valuesToArray();
         if (getAmount() == 2 && quarkStacks.length == 2 &&
                 quarkStacks[0].getDefinition().getMass() == quarkStacks[1].getDefinition().getMass() &&
-                quarkStacks[0].getDefinition().getMatterType() == -quarkStacks[1].getDefinition().getMatterType()) {
+                quarkStacks[0].getDefinition().getGeneration() == -quarkStacks[1].getDefinition().getGeneration()) {
             return EMDecay.NO_PRODUCT;
         } else if (getAmount() != 3) {
-            return new EMDecay[]{new EMDecay(0.95D, quarkStacks), EMBosonDefinition.deadEnd}; //decay into quarks
+            return new EMDecay[]{new EMDecay(0.95D, quarkStacks), deadEnd}; //decay into quarks
         } else {
             ArrayList<EMQuarkDefinition> newBaryon = new ArrayList<>();
             IEMDefinition[]              Particles = new IEMDefinition[2];
@@ -289,7 +287,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             EMQuarkDefinition lastQuark = newBaryon.remove(2);
 
             EMDefinitionStack[] decay;
-            if (Math.abs(lastQuark.getMatterType()) > 1) {
+            if (Math.abs(lastQuark.getGeneration()) > 1) {
                 decay = lastQuark.getDecayArray()[1].getOutputStacks().valuesToArray();
             } else {
                 decay = lastQuark.getDecayArray()[2].getOutputStacks().valuesToArray();
@@ -299,19 +297,19 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
             Particles[1] = decay[2].getDefinition();
 
             EMDefinitionStack[] contentOfBaryon = newBaryon.stream()
-                    .map(eQuarkDefinition -> new EMDefinitionStack(eQuarkDefinition,1))
+                    .map(eQuarkDefinition -> new EMDefinitionStack(eQuarkDefinition, 1))
                     .toArray(EMDefinitionStack[]::new);
 
             try {
                 return new EMDecay[]{
                         new EMDecay(0.001D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1], boson_Y__),
                         new EMDecay(0.99D, new EMHadronDefinition(false, contentOfBaryon), Particles[0], Particles[1]),
-                        EMBosonDefinition.deadEnd};
+                        deadEnd};
             } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
                 }
-                return new EMDecay[]{EMBosonDefinition.deadEnd};
+                return new EMDecay[]{deadEnd};
             }
         }
     }
@@ -337,7 +335,7 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     }
 
     @Override
-    public byte getMatterType() {
+    public int getGeneration() {
         return type;
     }
 
@@ -373,64 +371,48 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
     }
 
     @Override
-    public EMFluidDequantizationInfo someAmountIntoFluidStack() {
-        return null;
-    }
-
-    @Override
-    public EMItemDequantizationInfo someAmountIntoItemsStack() {
-        return null;
-    }
-
-    @Override
-    public EMOredictDequantizationInfo someAmountIntoOredictStack() {
-        return null;
-    }
-
-    @Override
-    protected int getIndirectTagValue() {
+    protected String getIndirectTagValue() {
         return nbtType;
     }
 
-    public static EMHadronDefinition fromNBT(NBTTagCompound nbt) {
-        EMDefinitionStack[] stacks = new EMDefinitionStack[nbt.getInteger("i")];
-        for (int i = 0; i < stacks.length; i++) {
-            stacks[i] = EMDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i)));
-        }
-        try {
-            return new EMHadronDefinition(stacks);
-        } catch (EMException e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-    }
-
-    public static void run() {
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(nbtType, new EMIndirectType((definitionsRegistry, nbt) ->
+                new EMHadronDefinition(EMConstantStackMap.fromNBT(definitionsRegistry, nbt)), EMHadronDefinition.class, "tt.keyword.Hadron"));
         try {
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
             protonMass = hadron_p.getMass();
             //redefine the proton with proper lifetime (the lifetime is based on mass comparison)
             hadron_p = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(2), EMQuarkDefinition.quark_d.getStackForm(1)));
-            SYMBOL_MAP.put(hadron_p,"p");
-            NAME_MAP.put(hadron_p,translateToLocal("tt.keyword.Proton"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p);
+            SYMBOL_MAP.put(hadron_p, "p");
+            UNLOCALIZED_NAME_MAP.put(hadron_p, "tt.keyword.Proton");
+            registry.registerForDisplay(hadron_p);
+            registry.registerDirectDefinition("p",hadron_p);
+
             hadron_p_ = (EMHadronDefinition) hadron_p.getAnti();
-            SYMBOL_MAP.put(hadron_p_,"~p");
-            NAME_MAP.put(hadron_p_,translateToLocal("tt.keyword.AntiProton"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_p_);
+            SYMBOL_MAP.put(hadron_p_, "~p");
+            UNLOCALIZED_NAME_MAP.put(hadron_p_, "tt.keyword.AntiProton");
+            registry.registerForDisplay(hadron_p_);
+            registry.registerDirectDefinition("~p",hadron_p_);
+
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             neutronMass = hadron_n.getMass();
             //redefine the neutron with proper lifetime (the lifetime is based on mass comparison)
             hadron_n = new EMHadronDefinition(new EMConstantStackMap(EMQuarkDefinition.quark_u.getStackForm(1), EMQuarkDefinition.quark_d.getStackForm(2)));
             SYMBOL_MAP.put(hadron_n, "n");
-            NAME_MAP.put(hadron_n,translateToLocal("tt.keyword.Neutron"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n);
+            UNLOCALIZED_NAME_MAP.put(hadron_n, "tt.keyword.Neutron");
+            registry.registerForDisplay(hadron_n);
+            registry.registerDirectDefinition("n",hadron_n);
+
             hadron_n_ = (EMHadronDefinition) hadron_n.getAnti();
-            SYMBOL_MAP.put(hadron_n_,"~n");
-            NAME_MAP.put(hadron_n_,translateToLocal("tt.keyword.AntiNeutron"));
-            EMDefinitionsRegistry.getStacksRegisteredForDisplay().add(hadron_n_);
+            SYMBOL_MAP.put(hadron_n_, "~n");
+            UNLOCALIZED_NAME_MAP.put(hadron_n_, "tt.keyword.AntiNeutron");
+            registry.registerForDisplay(hadron_n_);
+            registry.registerDirectDefinition("~n",hadron_n_);
+
+            TecTech.LOGGER.info("Old Neutron Mass: " + neutronMass);
+            TecTech.LOGGER.info("Old Proton Mass: " + protonMass);
+            TecTech.LOGGER.info("New Neutron Mass: " + EMHadronDefinition.hadron_n.getMass());
+            TecTech.LOGGER.info("New Proton Mass: " + EMHadronDefinition.hadron_p.getMass());
         } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -446,34 +428,29 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
         hadron_n3 = new EMDefinitionStack(hadron_n, 3D);
         hadron_p5 = new EMDefinitionStack(hadron_p, 5D);
 
-        try {
-            EMDefinitionsRegistry.registerDefinitionClass(nbtType, EMHadronDefinition::fromNBT,EMHadronDefinition.class,getClassTypeStatic());
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-        }
-        if(DEBUG_MODE) {
+        if (DEBUG_MODE) {
             TecTech.LOGGER.info("Registered Elemental Matter Class: Hadron " + nbtType + ' ' + getClassTypeStatic());
         }
     }
 
-    public static void setTransformations(){
+    public static void setTransformations(EMTransformationRegistry transformationInfo) {//Todo use Neutronium atom?
         //Added to atom map, but should be in its own
-        EMDefinitionStack neutrons =new EMDefinitionStack(hadron_n, 1000* AVOGADRO_CONSTANT_144);
-        TRANSFORMATION_INFO.getOredictDequantization().put(neutrons.getDefinition(),new EMOredictDequantizationInfo(neutrons, dust, Materials.Neutronium,1));
-        TRANSFORMATION_INFO.getOredictQuantization().put(
-                OreDictionary.getOreID(OrePrefixes.ingotHot.name()+Materials.Neutronium.mName),
-                new EMOredictQuantizationInfo(OrePrefixes.ingotHot,Materials.Neutronium,1 ,neutrons)
+        EMDefinitionStack neutrons = new EMDefinitionStack(hadron_n, 1000 * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED);
+        EMDequantizationInfo emDequantizationInfo = new EMDequantizationInfo(neutrons);
+        emDequantizationInfo.setOre(new OreDictionaryStack(1,OreDictionary.getOreID(OrePrefixes.dust.name() + Materials.Neutronium.mName)));//todo shitty looking, but works...
+        transformationInfo.getInfoMap().put(neutrons.getDefinition(), emDequantizationInfo);
+        transformationInfo.getOredictQuantization().put(
+                OreDictionary.getOreID(OrePrefixes.ingotHot.name() + Materials.Neutronium.mName),
+                new EMOredictQuantizationInfo(OrePrefixes.ingotHot, Materials.Neutronium, 1, neutrons)
         );
     }
 
     @Override
-    public byte getClassType() {
+    public int getMatterMassType() {
         return getClassTypeStatic();
     }
 
-    public static byte getClassTypeStatic(){
+    public static int getClassTypeStatic() {
         return -64;
     }
 
@@ -484,32 +461,32 @@ public final class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
-            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getClassType());
+        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+            lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
-        if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS|SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = "+getSimpleName());
+        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("NAME = " + getSimpleName());
             //lines.add("SYMBOL = "+getSymbol());
         }
-        if(Util.areBitsSet(SCAN_GET_CHARGE,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
-        if(Util.areBitsSet(SCAN_GET_COLOR,capabilities)) {
-            lines.add(getColor() < 0 ? "COLORLESS" : "CARRIES COLOR");
+        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+            lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
-        if(Util.areBitsSet(SCAN_GET_MASS,capabilities)) {
+        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
         }
-        if(Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)){
-            lines.add("HALF LIFE = "+getRawTimeSpan(energyLevel)+ " s");
-            lines.add("    "+"At current energy level");
+        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            lines.add("HALF LIFE = " + getRawTimeSpan(energyLevel) + " s");
+            lines.add("    " + "At current energy level");
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index f20f872a6e..9b77a6cab8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -1,46 +1,16 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
-/**
- * Created by danie_000 on 22.10.2016.
- */
-public final class EMBosonDefinition extends EMPrimitiveTemplate {
-    public static final EMBosonDefinition
-            boson_Y__ = new EMBosonDefinition("Photon", "\u03b3", 1e-18D, -1, 27),
-            boson_H__ = new EMBosonDefinition("Higgs", "\u0397", 126.09e9D, -2, 28);
-    //deadEnd
-    public static final EMDecay                   deadEnd     = new EMDecay(boson_Y__, boson_Y__);
-    public static final EMDecay           deadEndHalf = new EMDecay(boson_Y__);
-    public static final EMDefinitionStack boson_Y__1  =new EMDefinitionStack(boson_Y__,1);
-
-    private EMBosonDefinition(String name, String symbol, double mass, int color, int ID) {
-        super(name, symbol, 0, mass, 0, color, ID);
-    }
-
-    public static void run() {
-        boson_Y__.init(null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        boson_H__.init(null, 1.56e-22D, 2, 2,
-                new EMDecay(0.01D, quark_b, quark_b_),
-                new EMDecay(0.02D, lepton_t, lepton_t_),
-                new EMDecay(0.96D, new EMDefinitionStack(boson_Y__, 4)),
-                deadEnd);
+public abstract class EMBosonDefinition extends EMPrimitiveTemplate {
+    protected EMBosonDefinition(String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) {
+        super(name, symbol, generation, mass, charge, color, ID, bind);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Boson")+": " + getName();
-    }
-
-    @Override
-    public boolean isTimeSpanHalfLife() {
-        return this==boson_H__;
+        return translateToLocal("tt.keyword.Boson")+": " + translateToLocal(getUnlocalizedName());
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
new file mode 100644
index 0000000000..f8f05b80ee
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
@@ -0,0 +1,16 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+public abstract class EMFermionDefinition extends EMPrimitiveTemplate {
+    protected EMFermionDefinition(String name, String symbol, int generation, double mass, int charge, int color, int ID, String bind) {
+        super(name, symbol, generation, mass, charge, color, ID, bind);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.Fermion")+": " + translateToLocal(getUnlocalizedName());
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
new file mode 100644
index 0000000000..fb8128c3a5
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
@@ -0,0 +1,83 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public class EMGaugeBosonDefinition extends EMBosonDefinition {
+    public static final EMGaugeBosonDefinition
+            boson_g__ = new EMGaugeBosonDefinition("tt.keyword.Gluon", "g", 0, 0, 8, 27, "g"),
+            boson_Y__ = new EMGaugeBosonDefinition("tt.keyword.Photon", "\u03b3", 1e-18D, 0, -1, 28, "Y"),
+            boson_Z   = new EMGaugeBosonDefinition("tt.keyword.Weak0", "Z0", 91.1876e9, 0, -1, 29, "Z0"),
+            boson_W_  = new EMGaugeBosonDefinition("tt.keyword.WeakPlus", "W+", 80.379e9, 3, -1, 30, "W+"),
+            boson_W   = new EMGaugeBosonDefinition("tt.keyword.WeakMinus", "W-", 80.379e9, -3, -1, 31, "W-");
+    //deadEnd
+    public static final EMDecay           deadEnd     = new EMDecay(boson_Y__, boson_Y__);
+    public static final EMDefinitionStack boson_Y__1  = new EMDefinitionStack(boson_Y__, 1);
+    public static final EMDecay           deadEndHalf = new EMDecay(boson_Y__1);
+
+    protected EMGaugeBosonDefinition(String name, String symbol, double mass, int charge, int color, int ID, String bind) {
+        super(name, symbol, 0, mass, charge, color, ID, bind);
+    }
+
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMGaugeBosonDefinition.class, "tt.keyword.GaugeBoson"));
+        boson_g__.init(registry, boson_g__, 3e-50, 0, 0, deadEndHalf);
+        boson_Y__.init(registry, boson_Y__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        boson_Z.init(registry, boson_Z, 3e-25, 11, 11,
+                new EMDecay(0.03363, lepton_e, lepton_e_),
+                new EMDecay(0.03366, lepton_m, lepton_m_),
+                new EMDecay(0.03367, lepton_t, lepton_t_),
+                new EMDecay(0.068333, lepton_Ve, lepton_Ve_),
+                new EMDecay(0.068333, lepton_Vm, lepton_Vm_),
+                new EMDecay(0.068333, lepton_Vt, lepton_Vt_),
+                new EMDecay(0.118, quark_u, quark_u_),
+                new EMDecay(0.118, quark_c, quark_c_),
+                new EMDecay(0.152, quark_d, quark_d_),
+                new EMDecay(0.152, quark_s, quark_s_),
+                new EMDecay(0.152, quark_b, quark_b_),
+                deadEnd);
+        boson_W.init(registry, boson_W_, 3e-25, 9, 9,
+                new EMDecay(0.108, lepton_e, lepton_Ve_),
+                new EMDecay(0.108, lepton_m, lepton_Vm_),
+                new EMDecay(0.108, lepton_t, lepton_Vt_),
+                new EMDecay(0.112666, quark_u_, quark_d),
+                new EMDecay(0.112666, quark_u_, quark_s),
+                new EMDecay(0.112666, quark_u_, quark_b),
+                new EMDecay(0.112666, quark_c_, quark_d),
+                new EMDecay(0.112666, quark_c_, quark_s),
+                new EMDecay(0.112666, quark_c_, quark_b),
+                deadEnd);
+        boson_W_.init(registry, boson_W, 3e-25, 9, 9,
+                new EMDecay(0.108, lepton_e_, lepton_Ve),
+                new EMDecay(0.108, lepton_m_, lepton_Vm),
+                new EMDecay(0.108, lepton_t_, lepton_Vt),
+                new EMDecay(0.112666, quark_u, quark_d_),
+                new EMDecay(0.112666, quark_u, quark_s_),
+                new EMDecay(0.112666, quark_u, quark_b_),
+                new EMDecay(0.112666, quark_c, quark_d_),
+                new EMDecay(0.112666, quark_c, quark_s_),
+                new EMDecay(0.112666, quark_c, quark_b_),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.GaugeBoson") + ": " + translateToLocal(getUnlocalizedName());
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return false;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index 38e537ec59..c665bf23b4 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -1,57 +1,60 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.boson_Y__;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMScalarBosonDefinition.boson_H__;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMLeptonDefinition extends EMPrimitiveTemplate {
+public class EMLeptonDefinition extends EMFermionDefinition {
     public static final EMLeptonDefinition
-            lepton_e = new EMLeptonDefinition("Electron", "\u03b2-", 1, 0.511e6D, -3, 15),
-            lepton_m = new EMLeptonDefinition("Muon", "\u03bc-", 2, 105.658e6D, -3, 17),
-            lepton_t = new EMLeptonDefinition("Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19),
-            lepton_e_ = new EMLeptonDefinition("Positron", "\u03b2+", -1, 0.511e6D, 3, 16),
-            lepton_m_ = new EMLeptonDefinition("Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18),
-            lepton_t_ = new EMLeptonDefinition("Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20);
+            lepton_e = new EMLeptonDefinition("tt.keyword.Electron", "\u03b2-", 1, 0.511e6D, -3, 15,"e-"),
+            lepton_m = new EMLeptonDefinition("tt.keyword.Muon", "\u03bc-", 2, 105.658e6D, -3, 17,"m-"),
+            lepton_t = new EMLeptonDefinition("tt.keyword.Tauon", "\u03c4-", 3, 1776.83e6D, -3, 19,"t-"),
+            lepton_e_ = new EMLeptonDefinition("tt.keyword.Positron", "\u03b2+", -1, 0.511e6D, 3, 16,"e+"),
+            lepton_m_ = new EMLeptonDefinition("tt.keyword.Antimuon", "\u03bc+", -2, 105.658e6D, 3, 18,"m+"),
+            lepton_t_ = new EMLeptonDefinition("tt.keyword.Antitauon", "\u03c4+", -3, 1776.83e6D, 3, 20,"t+");
 
     public static final EMDefinitionStack lepton_e1  = new EMDefinitionStack(lepton_e, 1);
     public static final EMDefinitionStack lepton_e2  = new EMDefinitionStack(lepton_e, 2);
     public static final EMDefinitionStack lepton_e_1 = new EMDefinitionStack(lepton_e_, 1);
     public static final EMDefinitionStack lepton_e_2 = new EMDefinitionStack(lepton_e_, 2);
 
-    private EMLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, -1, ID);
+    protected EMLeptonDefinition(String name, String symbol, int type, double mass, int charge, int ID,String bind) {
+        super(name, symbol, type, mass, charge, -1, ID,bind);
         //this.itemThing=null;
         //this.fluidThing=null;
     }
 
-    public static void run() {
-        lepton_e.init(lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMLeptonDefinition.class,"tt.keyword.Lepton"));
+        lepton_e.init(registry,lepton_e_, STABLE_RAW_LIFE_TIME, 0, 1,
                 deadEnd,
                 new EMDecay(lepton_e,boson_Y__));
-        lepton_m.init(lepton_m_, 2.197019e-6D, 0, 1,
+        lepton_m.init(registry,lepton_m_, 2.197019e-6D, 0, 1,
                 new EMDecay(0.9D, lepton_e, lepton_Ve_, lepton_Vm),
                 deadEnd);//makes photons and don't care
-        lepton_t.init(lepton_t_, 2.906e-13D, 1, 3,
+        lepton_t.init(registry,lepton_t_, 2.903e-13D, 1, 3,
                 new EMDecay(0.05F, lepton_m, lepton_Vm_, lepton_Vt, boson_H__),
                 new EMDecay(0.1D, lepton_e, lepton_Ve_, lepton_Vm),
                 new EMDecay(0.8D, lepton_m, lepton_Vm_, lepton_Vt, boson_Y__),
                 deadEnd);//makes photons and don't care
 
-        lepton_e_.init(lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
+        lepton_e_.init(registry,lepton_e, STABLE_RAW_LIFE_TIME, 0, 1,
                 deadEnd,
                 new EMDecay(lepton_e,boson_Y__));
-        lepton_m_.init(lepton_m, 2.197019e-6F, 0, 1,
+        lepton_m_.init(registry,lepton_m, 2.197019e-6F, 0, 1,
                 new EMDecay(0.9F, lepton_e_, lepton_Ve, lepton_Vm_),
                 deadEnd);//makes photons and don't care
-        lepton_t_.init(lepton_t, 2.906e-13F, 1, 3,
+        lepton_t_.init(registry,lepton_t, 2.903e-13F, 1, 3,
                 new EMDecay(0.05F, lepton_m_, lepton_Vm, lepton_Vt_, boson_H__),
                 new EMDecay(0.1F, lepton_e_, lepton_Ve, lepton_Vm_),
                 new EMDecay(0.8F, lepton_m_, lepton_Vm, lepton_Vt_, boson_Y__),
@@ -60,7 +63,7 @@ public final class EMLeptonDefinition extends EMPrimitiveTemplate {
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Lepton")+": " + getName();
+        return translateToLocal("tt.keyword.Lepton")+": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index 9af7b97cb4..9ef04e8c7e 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -1,56 +1,59 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMBosonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEndHalf;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMNeutrinoDefinition extends EMPrimitiveTemplate {
+public class EMNeutrinoDefinition extends EMLeptonDefinition {
     public static final EMNeutrinoDefinition
-            lepton_Ve = new EMNeutrinoDefinition("Electron neutrino", "\u03bd\u03b2", 1, 2e0D, 21),
-            lepton_Vm = new EMNeutrinoDefinition("Muon neutrino", "\u03bd\u03bc", 2, 0.15e6D, 23),
-            lepton_Vt = new EMNeutrinoDefinition("Tauon neutrino", "\u03bd\u03c4", 3, 15e6D, 25),
-            lepton_Ve_ = new EMNeutrinoDefinition("Positron neutrino", "~\u03bd\u03b2", -1, 2e0D, 22),
-            lepton_Vm_ = new EMNeutrinoDefinition("Antimuon neutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24),
-            lepton_Vt_ = new EMNeutrinoDefinition("Antitauon neutrino", "~\u03bd\u03c4", -3, 15e6D, 26);
+            lepton_Ve = new EMNeutrinoDefinition("tt.keyword.ElectronNeutrino", "\u03bd\u03b2", 1, 2e0D, 21,"Ve-"),
+            lepton_Vm = new EMNeutrinoDefinition("tt.keyword.MuonNeutrino", "\u03bd\u03bc", 2, 0.15e6D, 23,"Vm-"),
+            lepton_Vt = new EMNeutrinoDefinition("tt.keyword.TauonNeutrino", "\u03bd\u03c4", 3, 15e6D, 25,"Vt-"),
+            lepton_Ve_ = new EMNeutrinoDefinition("tt.keyword.PositronNeutrino", "~\u03bd\u03b2", -1, 2e0D, 22,"Ve+"),
+            lepton_Vm_ = new EMNeutrinoDefinition("tt.keyword.AntimuonNeutrino", "~\u03bd\u03bc", -2, 0.15e6D, 24,"Vm+"),
+            lepton_Vt_ = new EMNeutrinoDefinition("tt.keyword.AntitauonNeutrino", "~\u03bd\u03c4", -3, 15e6D, 26,"Vt+");
 
     public static final EMDefinitionStack lepton_Ve1  = new EMDefinitionStack(lepton_Ve, 1);
     public static final EMDefinitionStack lepton_Ve2  = new EMDefinitionStack(lepton_Ve, 2);
     public static final EMDefinitionStack lepton_Ve_1 = new EMDefinitionStack(lepton_Ve_, 1);
     public static final EMDefinitionStack lepton_Ve_2 = new EMDefinitionStack(lepton_Ve_, 2);
 
-    private EMNeutrinoDefinition(String name, String symbol, int type, double mass, int ID) {
-        super(name, symbol, type, mass, 0, -1, ID);
+    protected EMNeutrinoDefinition(String name, String symbol, int type, double mass, int ID,String bind) {
+        super(name, symbol, type, mass, 0, ID,bind);
     }
 
-    public static void run() {
-        lepton_Ve.init(lepton_Ve_, 1D, -1, -1,
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMNeutrinoDefinition.class,"tt.keyword.Neutrino"));
+        lepton_Ve.init(registry,lepton_Ve_, 1D, -1, -1,
                 EMDecay.NO_PRODUCT);
-        lepton_Vm.init(lepton_Vm_, 1D, 1, 0,
+        lepton_Vm.init(registry,lepton_Vm_, 1D, 1, 0,
                 new EMDecay(0.825D, nothing),
                 deadEndHalf);
-        lepton_Vt.init(lepton_Vt_, 1, 1, 0,
+        lepton_Vt.init(registry,lepton_Vt_, 1, 1, 0,
                 new EMDecay(0.75F, nothing),
                 deadEnd);
 
-        lepton_Ve_.init(lepton_Ve, 1, -1, -1,
+        lepton_Ve_.init(registry,lepton_Ve, 1, -1, -1,
                 EMDecay.NO_PRODUCT);
-        lepton_Vm_.init(lepton_Vm, 1, 1, 0,
+        lepton_Vm_.init(registry,lepton_Vm, 1, 1, 0,
                 new EMDecay(0.825F, nothing),
                 deadEndHalf);
-        lepton_Vt_.init(lepton_Vt, 1, 1, 0,
+        lepton_Vt_.init(registry,lepton_Vt, 1, 1, 0,
                 new EMDecay(0.75F, nothing),
                 deadEnd);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Neutrino")+": " + getName();
+        return translateToLocal("tt.keyword.Neutrino")+": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index 41da06567d..60f87ac83b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -1,6 +1,8 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay.NO_DECAY;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -8,29 +10,45 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMPrimitiveDefinition extends EMPrimitiveTemplate {
+public class EMPrimitiveDefinition extends EMPrimitiveTemplate {
     public static final EMPrimitiveDefinition
-            nbtE__ = new EMPrimitiveDefinition("NBT ERROR", "!", 0, 0D, Integer.MIN_VALUE, 0),
-            null__ = new EMPrimitiveDefinition("NULL POINTER", ".", 0, 0D, -3, Integer.MIN_VALUE),
-            space__ = new EMPrimitiveDefinition("Space", "_", 0, 0D, -4, Integer.MIN_VALUE+1),
-            magic = new EMPrimitiveDefinition("Magic", "Ma", 4, 1e5D, 0, 1),
-            magic_ = new EMPrimitiveDefinition("Antimagic", "~Ma", -4, 1e5D, 0, 2);
-
-    private EMPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID) {
-        super(name, symbol, type, mass, 0, color, ID);
+           nbtE__  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveNBTERROR"    , "!"   , 0  , 0D   , -1 , Integer.MIN_VALUE     , "!"    ),
+           null__  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveNULLPOINTER" , "."   , 0  , 0D   , -3 , Integer.MIN_VALUE+1   , "."    ),
+           space   = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveSpace"       , "_"   , 0  , 0D   , -4 , Integer.MIN_VALUE + 2 , "_"    ),
+           space_   = new EMPrimitiveDefinition ( "tt.keyword.PrimitivePresence"    , "~_"  , 0  , 0D   , -4 , Integer.MIN_VALUE + 3 , "~_"   ),
+           mass    = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveMass"        , "#"   , 0  , 1    , -4 , Integer.MIN_VALUE + 4 , "#"    ),
+           mass_   = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveDarkMass"    , "~#"  , 0  , 1    , -4 , Integer.MIN_VALUE + 5 , "~#"   ),
+           energy  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveEnergy"      , "E"   , 4  , 0D   , -4 , Integer.MIN_VALUE + 6 , "E"    ),
+           energy_ = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveDarkEnergy"  , "~E"  , -4 , 0    , -4 , Integer.MIN_VALUE + 7 , "~E"   ),
+           magic   = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveMagic"       , "Ma"  , 5  , 1e5D , 0  , Integer.MIN_VALUE + 8 , "Ma"   ),
+           magic_  = new EMPrimitiveDefinition  ( "tt.keyword.PrimitiveAntimagic"   , "~Ma" , -5 , 1e5D , 0  , Integer.MIN_VALUE + 9 , "~Ma"  );
+
+
+    protected EMPrimitiveDefinition(String name, String symbol, int type, double mass, int color, int ID, String bind) {
+        super(name, symbol, type, mass, 0, color, ID, bind);
     }
 
-    public static void run() {
-        nbtE__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        null__.init(null__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        space__.init(space__, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        magic.init(magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
-        magic_.init(magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMPrimitiveDefinition.class, "tt.keyword.Primitive"));
+        nbtE__.init(registry, null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        null__.init(registry, null, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        space.init(registry, space_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        space_.init(registry, space, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        mass.init(registry, mass_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        mass_.init(registry, mass, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        energy.init(registry, energy_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        energy_.init(registry, energy, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+
+        magic.init(registry, magic_, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
+        magic_.init(registry, magic, NO_DECAY_RAW_LIFE_TIME, -1, -1, NO_DECAY);
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Primitive")+": " + getName();
+        return translateToLocal("tt.keyword.Primitive") + ": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index 3f19205aeb..19162bf90d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -1,8 +1,10 @@
 package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
 
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
 
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.deadEnd;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition.*;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -10,94 +12,95 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 /**
  * Created by danie_000 on 22.10.2016.
  */
-public final class EMQuarkDefinition extends EMPrimitiveTemplate {
+public class EMQuarkDefinition extends EMFermionDefinition {
     public static final EMQuarkDefinition
-            quark_u = new EMQuarkDefinition("Up", "u", 1, 2.3e6D, 2, 3),
-            quark_c = new EMQuarkDefinition("Charm", "c", 2, 1.29e9D, 2, 9),
-            quark_t = new EMQuarkDefinition("Top", "t", 3, 172.44e9D, 2, 13),
-            quark_d = new EMQuarkDefinition("Down", "d", 1, 4.8e6D, -1, 5),
-            quark_s = new EMQuarkDefinition("Strange", "s", 2, 95e6D, -1, 7),
-            quark_b = new EMQuarkDefinition("Bottom", "b", 3, 4.65e9D, -1, 11),
-            quark_u_ = new EMQuarkDefinition("AntiUp", "~u", -1, 2.3e6D, -2, 4),
-            quark_c_ = new EMQuarkDefinition("AntiCharm", "~c", -2, 1.29e9D, -2, 10),
-            quark_t_ = new EMQuarkDefinition("AntiTop", "~t", -3, 172.44e9D, -2, 14),
-            quark_d_ = new EMQuarkDefinition("AntiDown", "~d", -1, 4.8e6D, 1, 6),
-            quark_s_ = new EMQuarkDefinition("AntiStrange", "~s", -2, 95e6D, 1, 8),
-            quark_b_ = new EMQuarkDefinition("AntiBottom", "~b", -3, 4.65e9D, 1, 12);
+            quark_u = new EMQuarkDefinition("tt.keyword.QuarkUp", "u", 1, 2.3e6D, 2, 3,"u"),
+            quark_c = new EMQuarkDefinition("tt.keyword.QuarkCharm", "c", 2, 1.29e9D, 2, 9,"c"),
+            quark_t = new EMQuarkDefinition("tt.keyword.QuarkTop", "t", 3, 172.44e9D, 2, 13,"t"),
+            quark_d = new EMQuarkDefinition("tt.keyword.QuarkDown", "d", 1, 4.8e6D, -1, 5,"d"),
+            quark_s = new EMQuarkDefinition("tt.keyword.QuarkStrange", "s", 2, 95e6D, -1, 7,"s"),
+            quark_b = new EMQuarkDefinition("tt.keyword.QuarkBottom", "b", 3, 4.65e9D, -1, 11,"b"),
+            quark_u_ = new EMQuarkDefinition("tt.keyword.QuarkAntiUp", "~u", -1, 2.3e6D, -2, 4,"~u"),
+            quark_c_ = new EMQuarkDefinition("tt.keyword.QuarkAntiCharm", "~c", -2, 1.29e9D, -2, 10,"~c"),
+            quark_t_ = new EMQuarkDefinition("tt.keyword.QuarkAntiTop", "~t", -3, 172.44e9D, -2, 14,"~t"),
+            quark_d_ = new EMQuarkDefinition("tt.keyword.QuarkAntiDown", "~d", -1, 4.8e6D, 1, 6,"~d"),
+            quark_s_ = new EMQuarkDefinition("tt.keyword.QuarkAntiStrange", "~s", -2, 95e6D, 1, 8,"~s"),
+            quark_b_ = new EMQuarkDefinition("tt.keyword.QuarkAntiBottom", "~b", -3, 4.65e9D, 1, 12,"~b");
 
-    private EMQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID) {
-        super(name, symbol, type, mass, charge, 0, ID);
+    protected EMQuarkDefinition(String name, String symbol, int type, double mass, int charge, int ID,String bind) {
+        super(name, symbol, type, mass, charge, 0, ID,bind);
     }
 
-    public static void run() {
-        quark_u.init(quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMQuarkDefinition.class,"tt.keyword.Quark"));
+        quark_u.init(registry,quark_u_, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(1.23201e-5D, quark_b/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.050778116D, quark_s/*,lepton_m_,lepton_Vm*/),
                 new EMDecay(0.9D, quark_d, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c.init(quark_c_, 0.5e-13D, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_c.init(registry,quark_c_, 0.5e-13D, 1, -1,
                 new EMDecay(0.00169744D, quark_b/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.05071504D, quark_d, lepton_m_, lepton_Vm),
                 new EMDecay(0.9D, quark_s, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t.init(quark_t_, 2.5e-26D, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_t.init(registry,quark_t_, 2.5e-26D, 0, -1,
                 new EMDecay(7.51689e-5D, quark_d, lepton_t_, lepton_Vt),
                 new EMDecay(0.00163216D, quark_s, lepton_m_, lepton_Vm),
                 new EMDecay(0.9D, quark_b, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
 
-        quark_d.init(quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
+        quark_d.init(registry,quark_d_, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(7.51689e-5D, quark_t/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.05071504D, quark_c/*,lepton_m,lepton_Vm_*/),
                 new EMDecay(0.9D, quark_u, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s.init(quark_s_, 0.6e-9D, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_s.init(registry,quark_s_, 0.6e-9D, 1, -1,
                 new EMDecay(0.00163216D, quark_t/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.050778116D, quark_u, lepton_m, lepton_Vm_),
                 new EMDecay(0.9D, quark_c, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b.init(quark_b_, 0.7e-13D, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_b.init(registry,quark_b_, 0.7e-13D, 0, -1,
                 new EMDecay(1.23201e-5D, quark_u, lepton_t, lepton_Vt_),
                 new EMDecay(0.00169744D, quark_c, lepton_m, lepton_Vm_),
                 new EMDecay(0.9D, quark_t, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
 
-        quark_u_.init(quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
+        quark_u_.init(registry,quark_u, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(1.23201e-5D, quark_b_/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.050778116D, quark_s_/*,lepton_m,lepton_Vm_*/),
                 new EMDecay(0.9D, quark_d_, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_c_.init(quark_c, 0.5e-13D, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_c_.init(registry,quark_c, 0.5e-13D, 1, -1,
                 new EMDecay(0.00169744F, quark_b_/*,lepton_t,lepton_Vt_*/),
                 new EMDecay(0.05071504F, quark_d_, lepton_m, lepton_Vm_),
                 new EMDecay(0.9F, quark_s_, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_t_.init(quark_t, 2.5e-26F, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_t_.init(registry,quark_t, 2.5e-26F, 0, -1,
                 new EMDecay(7.51689e-5F, quark_d_, lepton_t, lepton_Vt_),
                 new EMDecay(0.00163216F, quark_s_, lepton_m, lepton_Vm_),
                 new EMDecay(0.9F, quark_b_, lepton_e, lepton_Ve_),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
 
-        quark_d_.init(quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
+        quark_d_.init(registry,quark_d, STABLE_RAW_LIFE_TIME, 3, -1,
                 new EMDecay(7.51689e-5F, quark_t_/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.05071504F, quark_c_/*,lepton_m_,lepton_Vm*/),
                 new EMDecay(0.9F, quark_u_, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_s_.init(quark_s, 0.6e-9F, 1, -1,
+                deadEnd);//makes photons and don't care
+        quark_s_.init(registry,quark_s, 0.6e-9F, 1, -1,
                 new EMDecay(0.00163216F, quark_t_/*,lepton_t_,lepton_Vt*/),
                 new EMDecay(0.050778116F, quark_u_, lepton_m_, lepton_Vm),
                 new EMDecay(0.9F, quark_c_, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
-        quark_b_.init(quark_b, 0.7e-13F, 0, -1,
+                deadEnd);//makes photons and don't care
+        quark_b_.init(registry,quark_b, 0.7e-13F, 0, -1,
                 new EMDecay(1.23201e-5F, quark_u_, lepton_t_, lepton_Vt),
                 new EMDecay(0.00169744F, quark_c_, lepton_m_, lepton_Vm),
                 new EMDecay(0.9F, quark_t_, lepton_e_, lepton_Ve),
-                EMBosonDefinition.deadEnd);//makes photons and don't care
+                deadEnd);//makes photons and don't care
     }
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Quark")+": " + getName();
+        return translateToLocal("tt.keyword.Quark")+": " + translateToLocal(getUnlocalizedName());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
new file mode 100644
index 0000000000..5070954847
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
@@ -0,0 +1,46 @@
+package com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
+
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition.*;
+import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition.*;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by danie_000 on 22.10.2016.
+ */
+public class EMScalarBosonDefinition extends EMBosonDefinition {
+    public static final EMScalarBosonDefinition
+            boson_H__ = new EMScalarBosonDefinition("tt.keyword.Higgs", "H0", 125.09e9D, -2, 32,"H0");
+
+    private EMScalarBosonDefinition(String name, String symbol, double mass, int color, int ID,String bind) {
+        super(name, symbol, 0, mass, 0, color, ID,bind);
+    }
+
+    public static void run(EMDefinitionsRegistry registry) {
+        registry.registerDefinitionClass(new EMType(EMScalarBosonDefinition.class,"tt.keyword.ScalarBoson"));
+        boson_H__.init(registry,boson_H__, 1.56e-22D, 8, 8,
+                new EMDecay ( 0.0002171 , lepton_m   , lepton_m_  ),
+                new EMDecay ( 0.001541  , boson_Z, boson_Y__  ),
+                new EMDecay ( 0.02641   , boson_Z, boson_Z),
+                new EMDecay ( 0.02884   , quark_c    , quark_c_   ),
+                new EMDecay ( 0.06256   , lepton_t   , lepton_t_  ),
+                new EMDecay ( 0.0818    , boson_g__  , boson_g__  ),
+                new EMDecay ( 0.2152    , boson_W_, boson_W),
+                new EMDecay ( 0.5809    , quark_b    , quark_b_   ),
+                deadEnd);
+    }
+
+    @Override
+    public String getLocalizedName() {
+        return translateToLocal("tt.keyword.ScalarBoson")+": " + translateToLocal(getUnlocalizedName());
+    }
+
+    @Override
+    public boolean isTimeSpanHalfLife() {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
index b7310485a2..68607ae737 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java
@@ -1,11 +1,10 @@
 package com.github.technus.tectech.recipe;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.IEMMapRead;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.util.GT_Recipe;
 import net.minecraft.item.ItemStack;
@@ -16,8 +15,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-
 public class TT_recipe extends GT_Recipe {
     public static final String        E_RECIPE_ID = "eRecipeID";
     public final EMConstantStackMap[]             input;
@@ -257,20 +254,6 @@ public class TT_recipe extends GT_Recipe {
             return mRecipeMap.get(stack);
         }
 
-        public T findRecipe(ItemStack dataHandler){
-            if(dataHandler==null || dataHandler.stackTagCompound==null) {
-                return null;
-            }
-            try {
-                return mRecipeMap.get(EMDefinitionsRegistry.fromNBT(dataHandler.stackTagCompound.getCompoundTag(E_RECIPE_ID)));
-            }catch (Exception e){
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return null;
-            }
-        }
-
         public void add(T recipe){
             mRecipeMap.put(recipe.mResearchEM,recipe);
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
index d34d12c754..42fb14f55d 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
@@ -13,7 +13,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 17.12.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
index bac2dfb9ac..2a8bb37a0b 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java
@@ -10,7 +10,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static com.github.technus.tectech.thing.metaTileEntity.Textures.*;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
index eb590ab2e2..f3574007f2 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
@@ -18,7 +18,7 @@ import net.minecraft.world.IBlockAccess;
 import java.util.List;
 
 import static com.github.technus.tectech.TecTech.tectechTexturePage1;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 03.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
index c65870eeb7..9648e41d8d 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
@@ -16,7 +16,7 @@ import net.minecraft.world.IBlockAccess;
 
 import java.util.List;
 
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 
 /**
  * Created by danie_000 on 03.10.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
index 90f3312342..cc071d2326 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/AvrProgrammer.java
@@ -28,7 +28,7 @@ import java.io.OutputStream;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 @Optional.InterfaceList(
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
index 81fec52ebd..082c0458c0 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
@@ -12,7 +12,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index 2062173cfd..d909054196 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -1,15 +1,15 @@
 package com.github.technus.tectech.thing.item;
 
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMDefinitionsRegistry;
-import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
+import com.github.technus.tectech.util.CommonValues;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -30,8 +30,8 @@ import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.*;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -61,7 +61,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
                     EMInstanceStackMap content = ((IEMContainer) metaTE).getContentHandler();
                     if (tNBT.hasKey("content")) {
                         try {
-                            content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+                            content.putUnifyAll(EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content")));
                         } catch (EMException e) {
                             if (DEBUG_MODE) {
                                 e.printStackTrace();
@@ -75,7 +75,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
                     } else if (content.hasStacks()) {
                         ((IEMContainer) metaTE).purgeOverflow();
                         tNBT.setTag("info", content.getInfoNBT());
-                        tNBT.setTag("content", content.toNBT());
+                        tNBT.setTag("content", content.toNBT(TecTech.definitionsRegistry));
                         tNBT.setTag("symbols", content.getShortSymbolsNBT());
                         content.clear();
                     }
@@ -94,7 +94,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         }
         if (tNBT.hasKey("content")) {
             try {
-                content.putUnifyAll(EMInstanceStackMap.fromNBT(tNBT.getCompoundTag("content")));
+                content.putUnifyAll(EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content")));
             } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
@@ -106,7 +106,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
             tNBT.removeTag("symbols");
         } else if (content.hasStacks()) {
             tNBT.setTag("info", content.getInfoNBT());
-            tNBT.setTag("content", content.toNBT());
+            tNBT.setTag("content", content.toNBT(TecTech.definitionsRegistry));
             tNBT.setTag("symbols", content.getShortSymbolsNBT());
             content.clear();
         }
@@ -140,10 +140,10 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         ItemStack that = new ItemStack(this, 1);
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
-        for(IEMDefinition definition: EMDefinitionsRegistry.getStacksRegisteredForDisplay()){
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 144 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_144))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" 1000 mol"),new EMInstanceStackMap(new EMInstanceStack(definition, AVOGADRO_CONSTANT_1000))));
+        for(IEMDefinition definition: TecTech.definitionsRegistry.getStacksRegisteredForDisplay()){
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.itemMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1000+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k))));
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index 2cca6474f4..f0f59e0e86 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -1,5 +1,6 @@
 package com.github.technus.tectech.thing.item;
 
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
@@ -20,7 +21,7 @@ import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -48,7 +49,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
             EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= EMConstantStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content"));
                 } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
@@ -56,7 +57,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 }
             }
             tNBT.setTag("info", definitions.getInfoNBT());
-            tNBT.setTag("content", definitions.toNBT());
+            tNBT.setTag("content", definitions.toNBT(TecTech.definitionsRegistry));
             tNBT.setTag("symbols",definitions.getShortSymbolsNBT());
             return oldMap;
         }
@@ -71,7 +72,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
                 return null;
             }
             try {
-                return EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                return EMConstantStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content"));
             } catch (EMException e) {
                 if (DEBUG_MODE) {
                     e.printStackTrace();
@@ -91,7 +92,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
             EMConstantStackMap oldMap =null;
             if (tNBT.hasKey("content")) {
                 try {
-                    oldMap= EMConstantStackMap.fromNBT(tNBT.getCompoundTag("content"));
+                    oldMap= EMConstantStackMap.fromNBT(TecTech.definitionsRegistry,tNBT.getCompoundTag("content"));
                 } catch (EMException e) {
                     if (DEBUG_MODE) {
                         e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index e517fe5f2a..8b8133a1e2 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java
index f4531a248b..4fca682268 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/EuMeterGT.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
index 39193fd598..749249d768 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
@@ -12,7 +12,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
index 1d1da74a7a..7f9e0f0a4a 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.loader.gui.CreativeTabTecTech.creativeTabTecTech;
+import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
index 69ff06e9e7..bc853334d2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
@@ -193,7 +193,7 @@ public class Textures {
 
     public static ITexture TESLA_TRANSCEIVER_TOP_BA = new GT_RenderedTexture(TESLA_TRANSCEIVER_TOP);
 
-    public Textures(){
+    public static void run(){
         for (byte i = 0; i < MACHINE_CASINGS_TT.length; i++) {
             for (byte j = 0; j < MACHINE_CASINGS_TT[i].length; j++) {
                 MACHINE_CASINGS_TT[i][j] = new GT_SidedTexture(MACHINECASINGS_BOTTOM_TT[i], MACHINECASINGS_TOP_TT[i], MACHINECASINGS_SIDE_TT[i], Dyes.getModulation(j - 1, MACHINE_METAL.mRGBa));
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 0950a173ab..84f18ad2bf 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -24,7 +24,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 import static com.github.technus.tectech.util.CommonValues.*;
 import static gregtech.api.enums.Dyes.MACHINE_METAL;
 import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity;
@@ -83,7 +83,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         //aNBT.setFloat("lifeTimeMult",lifeTimeMult);
         aNBT.setDouble("OverflowMatter", overflowMatter);
         content.cleanUp();
-        aNBT.setTag("eM_Stacks", content.toNBT());
+        aNBT.setTag("eM_Stacks", content.toNBT(TecTech.definitionsRegistry));
         aNBT.setShort("eID", id);
     }
 
@@ -95,7 +95,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         overflowMatter = aNBT.getFloat("overflowMatter")+aNBT.getDouble("OverflowMatter");
         id = aNBT.getShort("eID");
         try {
-            content = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eM_Stacks"));
+            content = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eM_Stacks"));
         } catch (EMException e) {
             if (DEBUG_MODE) {
                 e.printStackTrace();
@@ -210,7 +210,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     public double getMaxStackSize() {
-        return mTier * (mTier - 7) * 64D * AVOGADRO_CONSTANT_144;
+        return mTier * (mTier - 7) * 64D * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
deleted file mode 100644
index 3015d024c7..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_collider.java
+++ /dev/null
@@ -1,717 +0,0 @@
-package com.github.technus.tectech.thing.metaTileEntity.multi;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
-import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
-import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
-import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
-import com.github.technus.tectech.util.CommonValues;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.HashMap;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
-import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
-import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
-import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
-import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
-import static com.github.technus.tectech.util.DoubleCount.add;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by danie_000 on 17.12.2016.
- */
-public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
-    //region variables
-    private static Textures.BlockIcons.CustomIcon ScreenOFF;
-    private static Textures.BlockIcons.CustomIcon ScreenON;
-    private static Textures.BlockIcons.CustomIcon ScreenON_Slave;
-    private static Textures.BlockIcons.CustomIcon ScreenOFF_Slave;
-
-    protected static final byte FUSE_MODE = 0, COLLIDE_MODE = 1;
-    private static double MASS_TO_EU_INSTANT;
-    private static int STARTUP_COST, KEEPUP_COST;
-
-    protected byte            eTier = 0;
-    protected EMInstanceStack stack;
-    private   long            plasmaEnergy;
-
-    protected boolean started = false;
-    //endregion
-
-    //region collision handlers
-    public static final HashMap<Integer, IColliderHandler> FUSE_HANDLERS = new HashMap<>();
-    public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
-
-    public interface IPrimitiveColliderHandler {
-        void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out);
-    }
-
-    public interface IColliderHandler extends IPrimitiveColliderHandler {
-        byte getRequiredTier();
-    }
-
-    static {
-        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | EMAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
-                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 1;
-            }
-        });
-        registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAtomFuse(EMPrimitiveTemplate.getClassTypeStatic());
-
-        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
-                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 2;
-            }
-        });
-        FUSE_HANDLERS.put((EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 2;
-            }
-        });
-
-        registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
-        registerSimpleAspectFuse(EMPrimitiveTemplate.getClassTypeStatic());
-
-        FUSE_HANDLERS.put((EMPrimitiveTemplate.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
-                if (collisionHandler != null) {
-                    collisionHandler.collide(in2, in1, out);
-                } else {
-                    out.putUnifyAll(in1, in2);
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 2;
-            }
-        });
-
-        PRIMITIVE_FUSE_HANDLERS.put(EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> {
-            try {
-                EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                defs.putUnifyExact(in1.getDefinition().getStackForm(1));
-                defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-                EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
-            } catch (Exception e) {
-                out.putUnifyAll(in1, in2);
-                return;
-            }
-            if (in1.getAmount() > in2.getAmount()) {
-                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-            } else if (in2.getAmount() > in1.getAmount()) {
-                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-            }
-        });
-        PRIMITIVE_FUSE_HANDLERS.put(EMPrimalAspectDefinition.class.getName() + '\0' + EMPrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
-            if (fuseAspects(in1, in2, out)) return;
-            if (in1.getAmount() > in2.getAmount()) {
-                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-            } else if (in2.getAmount() > in1.getAmount()) {
-                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-            }
-        });
-    }
-
-    private static boolean fuseAspects(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-        try {
-            EMDefinitionStackMap defs = new EMDefinitionStackMap();
-            defs.putUnifyExact(in1.getDefinition().getStackForm(1));
-            defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-            EMComplexAspectDefinition aspect = new EMComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-            out.putUnify(new EMInstanceStack(aspect, Math.min(in1.getAmount(), in2.getAmount())));
-        } catch (Exception e) {
-            out.putUnifyAll(in1, in2);
-            return true;
-        }
-        return false;
-    }
-
-    private static void registerSimpleAspectFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((EMComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                if (fuseAspects(in1, in2, out)) return;
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 1;
-            }
-        });
-    }
-
-    private static void registerSimpleAtomFuse(byte classTypeStatic) {
-        FUSE_HANDLERS.put((EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
-            @Override
-            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
-                try {
-                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
-                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
-                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
-                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
-                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
-                } catch (Exception e) {
-                    out.putUnifyAll(in1, in2);
-                    return;
-                }
-                if (in1.getAmount() > in2.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
-                } else if (in2.getAmount() > in1.getAmount()) {
-                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
-                }
-            }
-
-            @Override
-            public byte getRequiredTier() {
-                return 1;
-            }
-        });
-    }
-    //endregion
-
-    //region parameters
-    protected Parameters.Group.ParameterIn mode;
-    private static final IStatusFunction<GT_MetaTileEntity_EM_collider> MODE_STATUS = (base_EM, p) -> {
-        if (base_EM.isMaster()) {
-            double mode = p.get();
-            if (mode == FUSE_MODE || mode == COLLIDE_MODE) {
-                return STATUS_OK;
-            } else if (mode > 1) {
-                return STATUS_TOO_HIGH;
-            } else if (mode < 0) {
-                return STATUS_TOO_LOW;
-            }
-            return STATUS_WRONG;
-        }
-        return STATUS_OK;
-    };
-    private static final INameFunction<GT_MetaTileEntity_EM_collider> MODE_NAME = (base_EM, p) -> {
-        if (base_EM.isMaster()) {
-            double mode = p.get();
-            if (mode == FUSE_MODE) {
-                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.0");//Mode: Fuse
-            } else if (mode == COLLIDE_MODE) {
-                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.1");//Mode: Collide
-            }
-            return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.2");//Mode: Undefined
-        }
-        return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.3");//Currently Slaves...
-    };
-    //endregion
-
-    //region structure
-    //use multi A energy inputs, use less power the longer it runs
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = StructureDefinition
-            .<GT_MetaTileEntity_EM_collider>builder()
-            .addShapeOldApi("main", new String[][]{
-                    {"I0A0A0", "I00000", "I0A0A0",},
-                    {"H0000000", "G001111100", "H0000000",},
-                    {"F22223332222", "F41155555114", "F22223332222",},
-                    {"E2000000000002", "E4155111115514", "E2000000000002",},
-                    {"D20000E00002", "D41511E11514", "D20000E00002",},
-                    {"C2000I0002", "C4151I1514", "C2000I0002",},
-                    {"B2000K0002", "B4151K1514", "B2000K0002",},
-                    {"B200M002", "A0151M1510", "B200M002",},
-                    {"A0200M0020", "A0151M1510", "A0200M0020",},
-                    {"0020O0200", "0151O1510", "0020O0200",},
-                    {"A030O030", "0151O1510", "A030O030",},
-                    {"0030O0300", "0151O1510", "0030O0300",},
-                    {"A030O030", "0151O1510", "A030O030",},
-                    {"0020O0200", "0151O1510", "0020O0200",},
-                    {"A0200M0020", "A0151M1510", "A0200M0020",},
-                    {"B200M002", "A0151M1510", "B200M002",},
-                    {"B2000K0002", "B4151K1514", "B2000K0002",},
-                    {"C2000I0002", "C4151I1514", "C2000I0002",},
-                    {"D200002&&&200002", "D415112&.&211514", "D200002&&&200002",},
-                    {"E20!!22222!!02", "E4155111115514", "E20!!22222!!02",},
-                    {"F2222#$#2222", "F41155555114", "F2222#$#2222",},
-            })
-            .addElement('0', ofBlock(sBlockCasingsTT, 4))
-            .addElement('1', ofBlock(sBlockCasingsTT, 7))
-            .addElement('2', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
-                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 5)))
-            .addElement('3', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('4', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
-                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 6)))
-            .addElement('5', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
-                    error(), ofBlock(sBlockCasingsTT, 8), ofBlock(sBlockCasingsTT, 9)))
-            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addClassicToMachineList,
-                    textureOffset, 1, sBlockCasingsTT, 0))
-            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList,
-                    textureOffset + 4, 2, sBlockCasingsTT, 4))
-            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList,
-                    textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('#', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList,
-                    textureOffset + 4, 4, sBlockCasingsTT, 4))
-            .build();
-    private static final String[] description = new String[]{
-            EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"),//2 - Elemental Input Hatches or Molecular Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.2"),//3 - Elemental Output Hatches or Molecular Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing
-            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction
-    };
-
-    @Override
-    public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() {
-        return STRUCTURE_DEFINITION;
-    }
-
-    //endregion
-
-    public GT_MetaTileEntity_EM_collider(int aID, String aName, String aNameRegional) {
-        super(aID, aName, aNameRegional);
-    }
-
-    public GT_MetaTileEntity_EM_collider(String aName) {
-        super(aName);
-    }
-
-    public static void setValues(int heliumPlasmaValue) {
-        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07* AVOGADRO_CONSTANT);//mass diff
-        MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20;
-        STARTUP_COST = -heliumPlasmaValue * 10000;
-        KEEPUP_COST = -heliumPlasmaValue;
-    }
-
-    protected double fuse(GT_MetaTileEntity_EM_collider partner) {///CAN MAKE EU
-        if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            boolean check = stack.getDefinition().fusionMakesEnergy(stack.getEnergy()) &&
-                    partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
-
-            EMInstanceStack stack2  = partner.stack;
-            double          preMass = add(stack2.getMass(),stack.getMass());
-            //System.out.println("preMass = " + preMass);
-
-            EMInstanceStackMap map = new EMInstanceStackMap();
-            IColliderHandler   colliderHandler;
-            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            }
-            for (EMInstanceStack newStack : map.valuesToArray()) {
-                check &= newStack.getDefinition().fusionMakesEnergy(newStack.getEnergy());
-            }
-            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new EMInstanceStackMap[]{map};
-
-            partner.stack = stack = null;
-            //System.out.println("check = " + check);
-            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
-            return check ? preMass - map.getMass() : Math.min(preMass - map.getMass(), 0);
-        }
-        return 0;
-    }
-
-    protected double collide(GT_MetaTileEntity_EM_collider partner) {//DOES NOT MAKE EU!
-        if (partner.stack != null && stack != null) {//todo add single event mode as an option
-            EMInstanceStack stack2  = partner.stack;
-            double          preMass = stack2.getMass() + stack.getMass();
-            //System.out.println("preMass = " + preMass);
-
-            EMInstanceStackMap map = new EMInstanceStackMap();
-            IColliderHandler   colliderHandler;
-            if (stack2.getDefinition().getClassType() > stack.getDefinition().getClassType()) {//always bigger first
-                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getClassType() << 16) | stack.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            } else {
-                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getClassType() << 16) | stack2.getDefinition().getClassType());
-                if (handleRecipe(stack2, map, colliderHandler)) return 0;
-            }
-            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
-            outputEM = new EMInstanceStackMap[]{map};
-
-            partner.stack = stack = null;
-            //System.out.println("check = " + check);
-            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
-            return Math.min(preMass - map.getMass(), 0);
-        }
-        return 0;
-    }
-
-    private boolean handleRecipe(EMInstanceStack stack2, EMInstanceStackMap map, IColliderHandler colliderHandler) {
-        if (colliderHandler != null && eTier >= colliderHandler.getRequiredTier()) {
-            colliderHandler.collide(stack2, stack, map);
-        } else {
-            map.putUnifyAll(stack, stack2);
-            outputEM = new EMInstanceStackMap[]{map};
-            return true;
-        }
-        return false;
-    }
-
-    protected GT_MetaTileEntity_EM_collider getPartner() {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
-        IGregTechTileEntity gregTechBaseTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir);
-        if (gregTechBaseTileEntity != null) {
-            IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity();
-            return gregTechMetaTileEntity instanceof GT_MetaTileEntity_EM_collider &&
-                    ((GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity).mMachine &&
-                    gregTechBaseTileEntity.getBackFacing() == iGregTechTileEntity.getFrontFacing() ?
-                    (GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity : null;
-        }
-        return null;
-    }
-
-    protected final boolean isMaster() {
-        return getBaseMetaTileEntity().getFrontFacing() % 2 == 0;
-    }
-
-    private void makeEU(double massDiff) {
-        plasmaEnergy += massDiff * MASS_TO_EU_INSTANT;
-        if (DEBUG_MODE) {
-            System.out.println("plasmaEnergy = " + plasmaEnergy);
-        }
-    }
-
-    private EMInstanceStackMap tickStack() {
-        if (stack == null) {
-            return null;
-        }
-        stack.setAge(stack.getAge() + 1);
-        EMDecayResult newInstances = stack.decay(1, stack.getAge(), 0);
-        if (newInstances == null) {
-            stack.nextColor();
-            return null;
-        } else {
-            stack = newInstances.getOutput().removeKey(newInstances.getOutput().getLast().getDefinition());
-            return newInstances.getOutput();
-        }
-    }
-
-    @Override
-    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_EM_collider(mName);
-    }
-
-    @Override
-    public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 2;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 2;
-        if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir) != sBlockCasingsTT) {
-            eTier = 0;
-            return false;
-        }
-
-        if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 8) {
-            eTier = 1;
-        } else if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 9) {
-            eTier = 2;
-        } else {
-            eTier = 0;
-            return false;
-        }
-        if (structureCheck_EM("main", 11, 1, 18)) {
-            return true;
-        }
-        eTier = 0;
-        return false;
-    }
-
-    @Override
-    public boolean checkRecipe_EM(ItemStack itemStack) {
-        GT_MetaTileEntity_EM_collider partner = getPartner();
-        if (partner == null) {
-            return false;
-        }
-        mEfficiencyIncrease = 10000;
-        if (started) {
-            if (stack == null) {
-                for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
-                    EMInstanceStackMap container = inputElemental.getContentHandler();
-                    if (container.isEmpty()) {
-                        continue;
-                    }
-                    stack = container.removeKey(container.getFirst().getDefinition());
-                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / EMAtomDefinition.getSomethingHeavy().getMass())) / 2;
-                    if (eut < Integer.MIN_VALUE + 7) {
-                        return false;
-                    }
-                    mMaxProgresstime = 20;
-                    mEUt = (int) eut;
-                    eAmpereFlow = 5;
-                    return true;
-                }
-                mMaxProgresstime = 20;
-                mEUt = KEEPUP_COST;
-                eAmpereFlow = 1;
-                return true;
-            }
-            mMaxProgresstime = 20;
-            mEUt = KEEPUP_COST;
-            eAmpereFlow = 2;
-        } else {
-            started = true;
-            mMaxProgresstime = 20;
-            mEUt = STARTUP_COST;
-            eAmpereFlow = 10;
-        }
-        return true;
-    }
-
-    @Override
-    public void outputAfterRecipe_EM() {
-        GT_MetaTileEntity_EM_collider partner = getPartner();
-        if (partner == null) {
-            if (stack != null) {
-                cleanMassEM_EM(stack.getMass());
-                stack = null;
-            }
-            return;
-        }
-        if (isMaster()) {
-            switch ((int) mode.get()) {
-                case FUSE_MODE:
-                    makeEU(fuse(partner));
-                    break;
-                case COLLIDE_MODE:
-                    collide(partner);//todo
-                    break;
-                default: {
-                    outputEM = new EMInstanceStackMap[2];
-                    outputEM[1] = tickStack();
-                    if (outputEM[1] == null) {
-                        outputEM[1] = partner.tickStack();
-                    } else {
-                        EMInstanceStackMap map = partner.tickStack();
-                        if (map != null) {
-                            outputEM[1].putUnifyAll(map);
-                        }
-                    }
-                }
-            }
-            if (outputEM != null) {
-                for (int i = 0, lim = Math.min(outputEM.length, eOutputHatches.size()); i < lim; i++) {
-                    if (outputEM[i] != null) {
-                        eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
-                        outputEM[i] = null;
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public String[] getDescription() {
-        return new String[]{
-                CommonValues.TEC_MARK_EM,
-                translateToLocal("gt.blockmachines.multimachine.em.collider.desc.0"),//Collide matter at extreme velocities.
-                EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.collider.desc.1")//Faster than light*!!!
-        };
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister aBlockIconRegister) {
-        ScreenOFF = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER");
-        ScreenON = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE");
-        ScreenOFF_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_SLAVE");
-        ScreenON_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE_SLAVE");
-        super.registerIcons(aBlockIconRegister);
-    }
-
-    @Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing) {
-            if (aFacing % 2 == 0) {
-                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF)};
-            } else {
-                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON_Slave : ScreenOFF_Slave)};
-            }
-        }
-        return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4]};
-    }
-
-    @Override
-    protected void parametersInstantiation_EM() {
-        Parameters.Group hatch_0 = parametrization.getGroup(0);
-        mode = hatch_0.makeInParameter(0, FUSE_MODE, MODE_NAME, MODE_STATUS);
-    }
-
-    @Override
-    public void parametersStatusesWrite_EM(boolean machineBusy) {
-        if (isMaster()) {
-            super.parametersStatusesWrite_EM(machineBusy);
-        }
-    }
-
-    @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        super.saveNBTData(aNBT);
-        aNBT.setByte("eTier", eTier);//collider tier
-        aNBT.setBoolean("eStarted", started);
-        if (stack != null) {
-            aNBT.setTag("eStack", stack.toNBT());
-        }
-        aNBT.setLong("ePlasmaEnergy", plasmaEnergy);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound aNBT) {
-        super.loadNBTData(aNBT);
-        eTier = aNBT.getByte("eTier");//collider tier
-        started = aNBT.getBoolean("eStarted");
-        if (aNBT.hasKey("eStack")) {
-            stack = EMInstanceStack.fromNBT(aNBT.getCompoundTag("eStack"));
-        }
-        plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
-    }
-
-    @Override
-    public void stopMachine() {
-        started = false;
-        if (stack != null) {
-            cleanMassEM_EM(stack.getMass());
-            stack = null;
-        }
-        super.stopMachine();
-    }
-
-    @Override
-    protected void afterRecipeCheckFailed() {
-        started = false;
-        if (stack != null) {
-            cleanMassEM_EM(stack.getMass());
-            stack = null;
-        }
-        getBaseMetaTileEntity().disableWorking();
-        super.afterRecipeCheckFailed();
-    }
-
-    @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        if (!aBaseMetaTileEntity.isAllowedToWork()) {
-            started = false;
-        }
-        super.onPreTick(aBaseMetaTileEntity, aTick);
-    }
-
-    @Override
-    public void construct(ItemStack stackSize, boolean hintsOnly) {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
-        if (hintsOnly) {
-            TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(),
-                    iGregTechTileEntity.getXCoord() + xDir,
-                    iGregTechTileEntity.getYCoord() + yDir,
-                    iGregTechTileEntity.getZCoord() + zDir,
-                    TT_Container_Casings.sHintCasingsTT, 12);
-        }
-        structureBuild_EM("main", 11, 1, 18, hintsOnly, stackSize);
-    }
-
-    @Override
-    public String[] getStructureDescription(ItemStack stackSize) {
-        return description;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index 84dafb8db2..1978d2acfc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
@@ -50,7 +50,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
-    public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10* AVOGADRO_CONSTANT;
+    public static final double URANIUM_INGOT_MASS_DIFF = 1.6114516E10* EM_COUNT_PER_MATERIAL_AMOUNT;
     private static final double URANIUM_MASS_TO_EU_PARTIAL = ConfigUtil.getDouble(MainConfig.get(), "balance/energy/generator/nuclear") * 3_000_000.0 / URANIUM_INGOT_MASS_DIFF;
     public static final double URANIUM_MASS_TO_EU_INSTANT = URANIUM_MASS_TO_EU_PARTIAL * 20;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index e769d3e480..7d5961f219 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
+import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemDequantizationInfo;
-import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMDequantizationInfo;
+import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.OreDictionaryStack;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -100,38 +100,21 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
         for (GT_MetaTileEntity_Hatch_InputElemental in : eInputHatches) {
             EMInstanceStackMap map = in.getContentHandler();
             for (EMInstanceStack stack : map.valuesToArray()) {
-                {
-                    EMFluidDequantizationInfo info = stack.getDefinition().someAmountIntoFluidStack();
-                    if (info != null) {
-                        if (map.removeAllAmounts(info.input())) {
-                            mOutputFluids = new FluidStack[]{info.output()};
-                            startRecipe(info.input(), stack.getEnergy());
-                            return true;
-                        }
-                    }
-                }
-                {
-                    EMItemDequantizationInfo info = stack.getDefinition().someAmountIntoItemsStack();
-                    if (info != null) {
-                        if (map.removeAllAmounts(info.input())) {
-                            mOutputItems = new ItemStack[]{info.output()};
-                            startRecipe(info.input(), stack.getEnergy());
-                            return true;
-                        }
-                    }
-                }
-                {
-                    EMOredictDequantizationInfo info = stack.getDefinition().someAmountIntoOredictStack();
-                    if (info != null) {
-                        if (map.removeAllAmounts(info.input())) {
-                            ArrayList<ItemStack> items = OreDictionary.getOres(info.getOut());
-                            if (items != null && !items.isEmpty()) {
-                                mOutputItems = new ItemStack[]{items.get(0)};
-                                startRecipe(info.input(), stack.getEnergy());
-                                return true;
-                            }
+                EMDequantizationInfo emDequantizationInfo = TecTech.transformationInfo.getInfoMap().get(stack.getDefinition());
+                if(emDequantizationInfo!=null && emDequantizationInfo.getStack()!=null && map.removeAllAmounts(emDequantizationInfo.getInput())){
+                    Object out=emDequantizationInfo.getStack();
+                    if(out instanceof ItemStack){
+                        mOutputItems=new ItemStack[]{emDequantizationInfo.getItem()};
+                    }else if(out instanceof FluidStack){
+                        mOutputFluids=new FluidStack[]{emDequantizationInfo.getFluid()};
+                    }else if(out instanceof OreDictionaryStack){
+                        ArrayList<ItemStack> items = OreDictionary.getOres(OreDictionary.getOreName(emDequantizationInfo.getOre().getOreId()));
+                        if (items != null && !items.isEmpty()) {
+                            mOutputItems = new ItemStack[]{items.get(0)};
                         }
                     }
+                    startRecipe(emDequantizationInfo.getInput(), stack.getEnergy());
+                    return true;
                 }
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 64949fe402..be036050be 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.DEFAULT_ENERGY_LEVEL;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.TRANSFORMATION_INFO;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
 import static com.github.technus.tectech.mechanics.structure.Structure.adders;
@@ -98,9 +97,9 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
-                    EMItemQuantizationInfo aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, false, null));
+                    EMItemQuantizationInfo aIQI = TecTech.transformationInfo.getItemQuantization().get(new EMItemQuantizationInfo(is, false, null));
                     if (aIQI == null) {
-                        aIQI = TRANSFORMATION_INFO.getItemQuantization().get(new EMItemQuantizationInfo(is, true, null));//todo check if works?
+                        aIQI = TecTech.transformationInfo.getItemQuantization().get(new EMItemQuantizationInfo(is, true, null));//todo check if works?
                     }
                     if (aIQI == null) {
                         //ORE DICT quantization //todo fix for uranium?
@@ -109,11 +108,11 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                             if (DEBUG_MODE) {
                                 TecTech.LOGGER.info("Quantifier-Ore-recipe " + is.getItem().getUnlocalizedName() + '.' + is.getItemDamage() + ' ' + OreDictionary.getOreName(ID));
                             }
-                            EMOredictQuantizationInfo aOQI = TRANSFORMATION_INFO.getOredictQuantization().get(ID);
+                            EMOredictQuantizationInfo aOQI = TecTech.transformationInfo.getOredictQuantization().get(ID);
                             if (aOQI == null) {
                                 continue;
                             }
-                            IEMStack into = aOQI.output();
+                            IEMStack into = aOQI.getOut();
                             if (into != null && isInputEqual(true, false, nullFluid, new ItemStack[]{new ItemStack(is.getItem(), aOQI.getAmount(), is.getItemDamage())}, null, inI)) {
                                 startRecipe(into);
                                 return true;
@@ -136,7 +135,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
             FluidStack[] inF = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
-                    EMFluidQuantizationInfo aFQI = TRANSFORMATION_INFO.getFluidQuantization().get(fs.getFluid().getID());
+                    EMFluidQuantizationInfo aFQI = TecTech.transformationInfo.getFluidQuantization().get(fs.getFluid().getID());
                     if (aFQI == null) {
                         continue;
                     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 74bb817142..89255b331a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -309,7 +309,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             NBTTagCompound tNBT = mInventory[1].getTagCompound();//code above makes it not null
 
             tNBT.setString("eMachineType", machineType);
-            tNBT.setTag(E_RECIPE_ID, objectResearched.toNBT());
+            tNBT.setTag(E_RECIPE_ID, objectResearched.toNBT(TecTech.definitionsRegistry));
             tNBT.setString("author", EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.WHITE + ' ' + machineType + " EM Recipe Generator");
         } else if (objectsScanned != null && CustomItemList.scanContainer.isStackEqual(mInventory[1], false, true)) {
             ElementalDefinitionScanStorage_EM.setContent(mInventory[1], objectsScanned, scanComplexity);
@@ -387,7 +387,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         aNBT.setLong("eComputationRemaining", computationRemaining);
         aNBT.setLong("eComputationRequired", computationRequired);
         if (objectResearched != null) {
-            aNBT.setTag("eObject", objectResearched.toNBT());
+            aNBT.setTag("eObject", objectResearched.toNBT(TecTech.definitionsRegistry));
         } else {
             aNBT.removeTag("eObject");
         }
@@ -397,7 +397,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             aNBT.removeTag("eScanComplexity");
         }
         if (objectsScanned != null) {
-            aNBT.setTag("eScanObjects", objectsScanned.toNBT());
+            aNBT.setTag("eScanObjects", objectsScanned.toNBT(TecTech.definitionsRegistry));
         } else {
             aNBT.removeTag("eScanObjects");
         }
@@ -409,7 +409,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         computationRemaining = aNBT.getLong("eComputationRemaining");
         computationRequired = aNBT.getLong("eComputationRequired");
         if (aNBT.hasKey("eObject")) {
-            objectResearched = EMDefinitionStack.fromNBT(aNBT.getCompoundTag("eObject"));
+            objectResearched = EMDefinitionStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eObject"));
             if (objectResearched.getDefinition() == nbtE__) {
                 objectResearched = null;
             }
@@ -423,7 +423,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         }
         try {
             if (aNBT.hasKey("eScanObjects")) {
-                objectsScanned = EMInstanceStackMap.fromNBT(aNBT.getCompoundTag("eScanObjects"));
+                objectsScanned = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eScanObjects"));
             }
         } catch (EMException e) {
             objectsScanned = new EMInstanceStackMap();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 9a6f99bed8..2fe43cb8e1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -757,7 +757,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             NBTTagCompound output = new NBTTagCompound();
             for (int i = 0; i < outputEM.length; i++) {
                 if (outputEM[i] != null) {
-                    output.setTag(Integer.toString(i), outputEM[i].toNBT());
+                    output.setTag(Integer.toString(i), outputEM[i].toNBT(TecTech.definitionsRegistry));
                 }
             }
             aNBT.setTag("outputEM", output);
@@ -847,7 +847,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             for (int i = 0; i < outputEM.length; i++) {
                 if (compound.hasKey(Integer.toString(i))) {
                     try {
-                        outputEM[i] = EMInstanceStackMap.fromNBT(compound.getCompoundTag(Integer.toString(i)));
+                        outputEM[i] = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,compound.getCompoundTag(Integer.toString(i)));
                     } catch (EMException e) {
                         if (DEBUG_MODE) {
                             e.printStackTrace();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
new file mode 100644
index 0000000000..cf8f26ff02
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
@@ -0,0 +1,709 @@
+package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider;
+
+import com.github.technus.tectech.TecTech;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
+import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
+import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
+import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
+import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
+import com.github.technus.tectech.mechanics.structure.StructureDefinition;
+import com.github.technus.tectech.thing.block.QuantumGlassBlock;
+import com.github.technus.tectech.thing.casing.TT_Container_Casings;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
+import com.github.technus.tectech.util.CommonValues;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.common.util.ForgeDirection;
+
+import java.util.HashMap;
+
+import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
+import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
+import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
+import static com.github.technus.tectech.util.DoubleCount.add;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+/**
+ * Created by danie_000 on 17.12.2016.
+ */
+public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
+    //region variables
+    private static Textures.BlockIcons.CustomIcon ScreenOFF;
+    private static Textures.BlockIcons.CustomIcon ScreenON;
+    private static Textures.BlockIcons.CustomIcon ScreenON_Slave;
+    private static Textures.BlockIcons.CustomIcon ScreenOFF_Slave;
+
+    protected static final byte FUSE_MODE = 0, COLLIDE_MODE = 1;
+    private static double MASS_TO_EU_INSTANT;
+    private static int STARTUP_COST, KEEPUP_COST;
+
+    protected byte            eTier = 0;
+    protected EMInstanceStack stack;
+    private   long            plasmaEnergy;
+
+    protected boolean started = false;
+    //endregion
+
+    //region collision handlers
+    public static final HashMap<Long, IColliderHandler> FUSE_HANDLERS = new HashMap<>();
+    public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
+
+    static {
+        FUSE_HANDLERS.put(((long) EMAtomDefinition.getClassTypeStatic() << 16) | EMAtomDefinition.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 1;
+            }
+        });
+        registerSimpleAtomFuse(EMHadronDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAtomFuse(EMPrimitiveTemplate.getClassTypeStatic());
+
+        FUSE_HANDLERS.put(((long) EMHadronDefinition.getClassTypeStatic() << 16) | EMHadronDefinition.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyAllExact(in2.getDefinition().getSubParticles());
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 2;
+            }
+        });
+        FUSE_HANDLERS.put(((long) EMHadronDefinition.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 2;
+            }
+        });
+
+        registerSimpleAspectFuse(EMComplexAspectDefinition.getClassTypeStatic());
+        registerSimpleAspectFuse(EMPrimitiveTemplate.getClassTypeStatic());
+
+        FUSE_HANDLERS.put(((long) EMPrimitiveTemplate.getClassTypeStatic() << 16) | EMPrimitiveTemplate.getClassTypeStatic(), new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                IPrimitiveColliderHandler collisionHandler = PRIMITIVE_FUSE_HANDLERS.get(in1.getDefinition().getClass().getName() + '\0' + in2.getDefinition().getClass().getName());
+                if (collisionHandler != null) {
+                    collisionHandler.collide(in2, in1, out);
+                } else {
+                    out.putUnifyAll(in1, in2);
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 2;
+            }
+        });
+
+        PRIMITIVE_FUSE_HANDLERS.put(EMQuarkDefinition.class.getName() + '\0' + EMQuarkDefinition.class.getName(), (in1, in2, out) -> {
+            try {
+                EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+                defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                EMHadronDefinition hadron = new EMHadronDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                out.putUnify(new EMInstanceStack(hadron, Math.min(in1.getAmount(), in2.getAmount())));
+            } catch (Exception e) {
+                out.putUnifyAll(in1, in2);
+                return;
+            }
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+            }
+        });
+        PRIMITIVE_FUSE_HANDLERS.put(EMPrimalAspectDefinition.class.getName() + '\0' + EMPrimalAspectDefinition.class.getName(), (in1, in2, out) -> {
+            if (fuseAspects(in1, in2, out)) return;
+            if (in1.getAmount() > in2.getAmount()) {
+                out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+            } else if (in2.getAmount() > in1.getAmount()) {
+                out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+            }
+        });
+    }
+
+    private static boolean fuseAspects(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+        try {
+            EMDefinitionStackMap defs = new EMDefinitionStackMap();
+            defs.putUnifyExact(in1.getDefinition().getStackForm(1));
+            defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+            EMComplexAspectDefinition aspect = new EMComplexAspectDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+            out.putUnify(new EMInstanceStack(aspect, Math.min(in1.getAmount(), in2.getAmount())));
+        } catch (Exception e) {
+            out.putUnifyAll(in1, in2);
+            return true;
+        }
+        return false;
+    }
+
+    private static void registerSimpleAspectFuse(int classTypeStatic) {
+        FUSE_HANDLERS.put(((long) EMComplexAspectDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                if (fuseAspects(in1, in2, out)) return;
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 1;
+            }
+        });
+    }
+
+    private static void registerSimpleAtomFuse(int classTypeStatic) {
+        FUSE_HANDLERS.put(((long) EMAtomDefinition.getClassTypeStatic() << 16) | classTypeStatic, new IColliderHandler() {
+            @Override
+            public void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out) {
+                try {
+                    EMDefinitionStackMap defs = new EMDefinitionStackMap();
+                    defs.putUnifyAllExact(in1.getDefinition().getSubParticles());
+                    defs.putUnifyExact(in2.getDefinition().getStackForm(1));
+                    EMAtomDefinition atom = new EMAtomDefinition(defs.toImmutable_optimized_unsafe_LeavesExposedElementalTree());
+                    out.putUnify(new EMInstanceStack(atom, Math.min(in1.getAmount(), in2.getAmount())));
+                } catch (Exception e) {
+                    out.putUnifyAll(in1, in2);
+                    return;
+                }
+                if (in1.getAmount() > in2.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in1.getDefinition(), in1.getAmount() - in2.getAmount()));
+                } else if (in2.getAmount() > in1.getAmount()) {
+                    out.putUnify(new EMInstanceStack(in2.getDefinition(), in2.getAmount() - in1.getAmount()));
+                }
+            }
+
+            @Override
+            public byte getRequiredTier() {
+                return 1;
+            }
+        });
+    }
+    //endregion
+
+    //region parameters
+    protected Parameters.Group.ParameterIn mode;
+    private static final IStatusFunction<GT_MetaTileEntity_EM_collider> MODE_STATUS = (base_EM, p) -> {
+        if (base_EM.isMaster()) {
+            double mode = p.get();
+            if (mode == FUSE_MODE || mode == COLLIDE_MODE) {
+                return STATUS_OK;
+            } else if (mode > 1) {
+                return STATUS_TOO_HIGH;
+            } else if (mode < 0) {
+                return STATUS_TOO_LOW;
+            }
+            return STATUS_WRONG;
+        }
+        return STATUS_OK;
+    };
+    private static final INameFunction<GT_MetaTileEntity_EM_collider> MODE_NAME = (base_EM, p) -> {
+        if (base_EM.isMaster()) {
+            double mode = p.get();
+            if (mode == FUSE_MODE) {
+                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.0");//Mode: Fuse
+            } else if (mode == COLLIDE_MODE) {
+                return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.1");//Mode: Collide
+            }
+            return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.2");//Mode: Undefined
+        }
+        return translateToLocal("gt.blockmachines.multimachine.em.collider.mode.3");//Currently Slaves...
+    };
+    //endregion
+
+    //region structure
+    //use multi A energy inputs, use less power the longer it runs
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = StructureDefinition
+            .<GT_MetaTileEntity_EM_collider>builder()
+            .addShapeOldApi("main", new String[][]{
+                    {"I0A0A0", "I00000", "I0A0A0",},
+                    {"H0000000", "G001111100", "H0000000",},
+                    {"F22223332222", "F41155555114", "F22223332222",},
+                    {"E2000000000002", "E4155111115514", "E2000000000002",},
+                    {"D20000E00002", "D41511E11514", "D20000E00002",},
+                    {"C2000I0002", "C4151I1514", "C2000I0002",},
+                    {"B2000K0002", "B4151K1514", "B2000K0002",},
+                    {"B200M002", "A0151M1510", "B200M002",},
+                    {"A0200M0020", "A0151M1510", "A0200M0020",},
+                    {"0020O0200", "0151O1510", "0020O0200",},
+                    {"A030O030", "0151O1510", "A030O030",},
+                    {"0030O0300", "0151O1510", "0030O0300",},
+                    {"A030O030", "0151O1510", "A030O030",},
+                    {"0020O0200", "0151O1510", "0020O0200",},
+                    {"A0200M0020", "A0151M1510", "A0200M0020",},
+                    {"B200M002", "A0151M1510", "B200M002",},
+                    {"B2000K0002", "B4151K1514", "B2000K0002",},
+                    {"C2000I0002", "C4151I1514", "C2000I0002",},
+                    {"D200002&&&200002", "D415112&.&211514", "D200002&&&200002",},
+                    {"E20!!22222!!02", "E4155111115514", "E20!!22222!!02",},
+                    {"F2222#$#2222", "F41155555114", "F2222#$#2222",},
+            })
+            .addElement('0', ofBlock(sBlockCasingsTT, 4))
+            .addElement('1', ofBlock(sBlockCasingsTT, 7))
+            .addElement('2', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 5)))
+            .addElement('3', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('4', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 6)))
+            .addElement('5', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1),
+                    error(), ofBlock(sBlockCasingsTT, 8), ofBlock(sBlockCasingsTT, 9)))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addClassicToMachineList,
+                    textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList,
+                    textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList,
+                    textureOffset + 4, 3, sBlockCasingsTT, 4))
+            .addElement('#', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList,
+                    textureOffset + 4, 4, sBlockCasingsTT, 4))
+            .build();
+    private static final String[] description = new String[]{
+            EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"),//2 - Elemental Input Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.2"),//3 - Elemental Output Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing
+            translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction
+    };
+
+    @Override
+    public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
+    }
+
+    //endregion
+
+    public GT_MetaTileEntity_EM_collider(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_EM_collider(String aName) {
+        super(aName);
+    }
+
+    public static void setValues(int heliumPlasmaValue) {
+        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07* EM_COUNT_PER_MATERIAL_AMOUNT);//mass diff
+        MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20;
+        STARTUP_COST = -heliumPlasmaValue * 10000;
+        KEEPUP_COST = -heliumPlasmaValue;
+    }
+
+    protected double fuse(GT_MetaTileEntity_EM_collider partner) {///CAN MAKE EU
+        if (partner.stack != null && stack != null) {//todo add single event mode as an option
+            boolean check = stack.getDefinition().fusionMakesEnergy(stack.getEnergy()) &&
+                    partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
+
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = add(stack2.getMass(),stack.getMass());
+            //System.out.println("preMass = " + preMass);
+
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getMatterMassType() > stack.getDefinition().getMatterMassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            } else {
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            }
+            for (EMInstanceStack newStack : map.valuesToArray()) {
+                check &= newStack.getDefinition().fusionMakesEnergy(newStack.getEnergy());
+            }
+            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
+            outputEM = new EMInstanceStackMap[]{map};
+
+            partner.stack = stack = null;
+            //System.out.println("check = " + check);
+            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
+            return check ? preMass - map.getMass() : Math.min(preMass - map.getMass(), 0);
+        }
+        return 0;
+    }
+
+    protected double collide(GT_MetaTileEntity_EM_collider partner) {//DOES NOT MAKE EU!
+        if (partner.stack != null && stack != null) {//todo add single event mode as an option
+            EMInstanceStack stack2  = partner.stack;
+            double          preMass = stack2.getMass() + stack.getMass();
+            //System.out.println("preMass = " + preMass);
+
+            EMInstanceStackMap map = new EMInstanceStackMap();
+            IColliderHandler   colliderHandler;
+            if (stack2.getDefinition().getMatterMassType() > stack.getDefinition().getMatterMassType()) {//always bigger first
+                colliderHandler = FUSE_HANDLERS.get((stack2.getDefinition().getMatterMassType() << 16) | stack.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            } else {
+                colliderHandler = FUSE_HANDLERS.get((stack.getDefinition().getMatterMassType() << 16) | stack2.getDefinition().getMatterMassType());
+                if (handleRecipe(stack2, map, colliderHandler)) return 0;
+            }
+            //System.out.println("outputEM[0].getMass() = " + outputEM[0].getMass());
+            outputEM = new EMInstanceStackMap[]{map};
+
+            partner.stack = stack = null;
+            //System.out.println("check = " + check);
+            //System.out.println("preMass-map.getMass() = " + (preMass - map.getMass()));
+            return Math.min(preMass - map.getMass(), 0);
+        }
+        return 0;
+    }
+
+    private boolean handleRecipe(EMInstanceStack stack2, EMInstanceStackMap map, IColliderHandler colliderHandler) {
+        if (colliderHandler != null && eTier >= colliderHandler.getRequiredTier()) {
+            colliderHandler.collide(stack2, stack, map);
+        } else {
+            map.putUnifyAll(stack, stack2);
+            outputEM = new EMInstanceStackMap[]{map};
+            return true;
+        }
+        return false;
+    }
+
+    protected GT_MetaTileEntity_EM_collider getPartner() {
+        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
+        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        IGregTechTileEntity gregTechBaseTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir);
+        if (gregTechBaseTileEntity != null) {
+            IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity();
+            return gregTechMetaTileEntity instanceof GT_MetaTileEntity_EM_collider &&
+                    ((GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity).mMachine &&
+                    gregTechBaseTileEntity.getBackFacing() == iGregTechTileEntity.getFrontFacing() ?
+                    (GT_MetaTileEntity_EM_collider) gregTechMetaTileEntity : null;
+        }
+        return null;
+    }
+
+    protected final boolean isMaster() {
+        return getBaseMetaTileEntity().getFrontFacing() % 2 == 0;
+    }
+
+    private void makeEU(double massDiff) {
+        plasmaEnergy += massDiff * MASS_TO_EU_INSTANT;
+        if (DEBUG_MODE) {
+            System.out.println("plasmaEnergy = " + plasmaEnergy);
+        }
+    }
+
+    private EMInstanceStackMap tickStack() {
+        if (stack == null) {
+            return null;
+        }
+        stack.setAge(stack.getAge() + 1);
+        EMDecayResult newInstances = stack.decay(1, stack.getAge(), 0);
+        if (newInstances == null) {
+            stack.nextColor();
+            return null;
+        } else {
+            stack = newInstances.getOutput().removeKey(newInstances.getOutput().getLast().getDefinition());
+            return newInstances.getOutput();
+        }
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_EM_collider(mName);
+    }
+
+    @Override
+    public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
+        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 2;
+        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 2;
+        if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir) != sBlockCasingsTT) {
+            eTier = 0;
+            return false;
+        }
+
+        if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 8) {
+            eTier = 1;
+        } else if (iGregTechTileEntity.getMetaIDOffset(xDir, 0, zDir) == 9) {
+            eTier = 2;
+        } else {
+            eTier = 0;
+            return false;
+        }
+        if (structureCheck_EM("main", 11, 1, 18)) {
+            return true;
+        }
+        eTier = 0;
+        return false;
+    }
+
+    @Override
+    public boolean checkRecipe_EM(ItemStack itemStack) {
+        GT_MetaTileEntity_EM_collider partner = getPartner();
+        if (partner == null) {
+            return false;
+        }
+        mEfficiencyIncrease = 10000;
+        if (started) {
+            if (stack == null) {
+                for (GT_MetaTileEntity_Hatch_InputElemental inputElemental : eInputHatches) {
+                    EMInstanceStackMap container = inputElemental.getContentHandler();
+                    if (container.isEmpty()) {
+                        continue;
+                    }
+                    stack = container.removeKey(container.getFirst().getDefinition());
+                    long eut = KEEPUP_COST + (long) (KEEPUP_COST * Math.abs(stack.getMass() / EMAtomDefinition.getSomethingHeavy().getMass())) / 2;
+                    if (eut < Integer.MIN_VALUE + 7) {
+                        return false;
+                    }
+                    mMaxProgresstime = 20;
+                    mEUt = (int) eut;
+                    eAmpereFlow = 5;
+                    return true;
+                }
+                mMaxProgresstime = 20;
+                mEUt = KEEPUP_COST;
+                eAmpereFlow = 1;
+                return true;
+            }
+            mMaxProgresstime = 20;
+            mEUt = KEEPUP_COST;
+            eAmpereFlow = 2;
+        } else {
+            started = true;
+            mMaxProgresstime = 20;
+            mEUt = STARTUP_COST;
+            eAmpereFlow = 10;
+        }
+        return true;
+    }
+
+    @Override
+    public void outputAfterRecipe_EM() {
+        GT_MetaTileEntity_EM_collider partner = getPartner();
+        if (partner == null) {
+            if (stack != null) {
+                cleanMassEM_EM(stack.getMass());
+                stack = null;
+            }
+            return;
+        }
+        if (isMaster()) {
+            switch ((int) mode.get()) {
+                case FUSE_MODE:
+                    makeEU(fuse(partner));
+                    break;
+                case COLLIDE_MODE:
+                    collide(partner);//todo
+                    break;
+                default: {
+                    outputEM = new EMInstanceStackMap[2];
+                    outputEM[1] = tickStack();
+                    if (outputEM[1] == null) {
+                        outputEM[1] = partner.tickStack();
+                    } else {
+                        EMInstanceStackMap map = partner.tickStack();
+                        if (map != null) {
+                            outputEM[1].putUnifyAll(map);
+                        }
+                    }
+                }
+            }
+            if (outputEM != null) {
+                for (int i = 0, lim = Math.min(outputEM.length, eOutputHatches.size()); i < lim; i++) {
+                    if (outputEM[i] != null) {
+                        eOutputHatches.get(i).getContentHandler().putUnifyAll(outputEM[i]);
+                        outputEM[i] = null;
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public String[] getDescription() {
+        return new String[]{
+                CommonValues.TEC_MARK_EM,
+                translateToLocal("gt.blockmachines.multimachine.em.collider.desc.0"),//Collide matter at extreme velocities.
+                EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.collider.desc.1")//Faster than light*!!!
+        };
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister aBlockIconRegister) {
+        ScreenOFF = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER");
+        ScreenON = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE");
+        ScreenOFF_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_SLAVE");
+        ScreenON_Slave = new Textures.BlockIcons.CustomIcon("iconsets/EM_COLLIDER_ACTIVE_SLAVE");
+        super.registerIcons(aBlockIconRegister);
+    }
+
+    @Override
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        if (aSide == aFacing) {
+            if (aFacing % 2 == 0) {
+                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON : ScreenOFF)};
+            } else {
+                return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4], new TT_RenderedExtendedFacingTexture(aActive ? ScreenON_Slave : ScreenOFF_Slave)};
+            }
+        }
+        return new ITexture[]{Textures.BlockIcons.casingTexturePages[texturePage][4]};
+    }
+
+    @Override
+    protected void parametersInstantiation_EM() {
+        Parameters.Group hatch_0 = parametrization.getGroup(0);
+        mode = hatch_0.makeInParameter(0, FUSE_MODE, MODE_NAME, MODE_STATUS);
+    }
+
+    @Override
+    public void parametersStatusesWrite_EM(boolean machineBusy) {
+        if (isMaster()) {
+            super.parametersStatusesWrite_EM(machineBusy);
+        }
+    }
+
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setByte("eTier", eTier);//collider tier
+        aNBT.setBoolean("eStarted", started);
+        if (stack != null) {
+            aNBT.setTag("eStack", stack.toNBT(TecTech.definitionsRegistry));
+        }
+        aNBT.setLong("ePlasmaEnergy", plasmaEnergy);
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        eTier = aNBT.getByte("eTier");//collider tier
+        started = aNBT.getBoolean("eStarted");
+        if (aNBT.hasKey("eStack")) {
+            stack = EMInstanceStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eStack"));
+        }
+        plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
+    }
+
+    @Override
+    public void stopMachine() {
+        started = false;
+        if (stack != null) {
+            cleanMassEM_EM(stack.getMass());
+            stack = null;
+        }
+        super.stopMachine();
+    }
+
+    @Override
+    protected void afterRecipeCheckFailed() {
+        started = false;
+        if (stack != null) {
+            cleanMassEM_EM(stack.getMass());
+            stack = null;
+        }
+        getBaseMetaTileEntity().disableWorking();
+        super.afterRecipeCheckFailed();
+    }
+
+    @Override
+    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if (!aBaseMetaTileEntity.isAllowedToWork()) {
+            started = false;
+        }
+        super.onPreTick(aBaseMetaTileEntity, aTick);
+    }
+
+    @Override
+    public void construct(ItemStack stackSize, boolean hintsOnly) {
+        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
+        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        if (hintsOnly) {
+            TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(),
+                    iGregTechTileEntity.getXCoord() + xDir,
+                    iGregTechTileEntity.getYCoord() + yDir,
+                    iGregTechTileEntity.getZCoord() + zDir,
+                    TT_Container_Casings.sHintCasingsTT, 12);
+        }
+        structureBuild_EM("main", 11, 1, 18, hintsOnly, stackSize);
+    }
+
+    @Override
+    public String[] getStructureDescription(ItemStack stackSize) {
+        return description;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java
new file mode 100644
index 0000000000..0114ac847b
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IColliderHandler.java
@@ -0,0 +1,5 @@
+package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider;
+
+public interface IColliderHandler extends IPrimitiveColliderHandler {
+    byte getRequiredTier();
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java
new file mode 100644
index 0000000000..3c4438b5e1
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/IPrimitiveColliderHandler.java
@@ -0,0 +1,8 @@
+package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider;
+
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
+
+public interface IPrimitiveColliderHandler {
+    void collide(EMInstanceStack in1, EMInstanceStack in2, EMInstanceStackMap out);
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
index d1eafa22fc..e6e618a31c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_Centrifuge.java
@@ -12,8 +12,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import java.util.Arrays;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.DoubleCount.*;
@@ -77,7 +76,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
         maxRPM = Math.sqrt(maxRCF / (0.001118D * radius));
         double maxSafeMass = EMAtomDefinition.getSomethingHeavy().getMass() * (1 << tier);
         maxForce = maxSafeMass * maxRCF;// (eV/c^2 * m/s) / g
-        maxCapacity = maxSafeMass * AVOGADRO_CONSTANT_144 * radius;// eV/c^2
+        maxCapacity = maxSafeMass * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED * radius;// eV/c^2
     }
 
     private double getRCF(double RPM) {
@@ -128,7 +127,7 @@ public class Behaviour_Centrifuge implements GT_MetaTileEntity_EM_machine.IBehav
             EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
             double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
             randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
-            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+            if (randomStack.isInvalidAmount()) {
                 input.removeKey(randomStack.getDefinition());
                 stacks = input.valuesToArray();
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
index 70d93b36ed..3d1259f808 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/Behaviour_ElectromagneticSeparator.java
@@ -9,10 +9,9 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.MultiblockControl;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_144;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationInfo.AVOGADRO_CONSTANT_UNCERTAINTY;
-import static com.github.technus.tectech.util.CommonValues.V;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
+import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.DoubleCount.mul;
 import static com.github.technus.tectech.util.DoubleCount.sub;
 
@@ -89,7 +88,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
     public Behaviour_ElectromagneticSeparator(int desiredTier){
         tier=(byte) desiredTier;
         ticks =Math.max(20,(1<<(12-desiredTier))*20);
-        maxCapacity= EMAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* AVOGADRO_CONSTANT_144;
+        maxCapacity= EMAtomDefinition.getSomethingHeavy().getMass()*(2<<tier)* EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
         maxCharge=144D*(1<<(tier-5));
         switch (tier){
             case 12:
@@ -159,7 +158,7 @@ public class Behaviour_ElectromagneticSeparator implements GT_MetaTileEntity_EM_
             EMInstanceStack randomStack    = stacks[TecTech.RANDOM.nextInt(stacks.length)];
             double          amountToRemove = TecTech.RANDOM.nextDouble()/10D * randomStack.getAmount();
             randomStack.setAmount(sub(randomStack.getAmount(),amountToRemove));//mutates the parent InstanceStackMap
-            if (randomStack.getAmount() < AVOGADRO_CONSTANT_UNCERTAINTY) {
+            if (randomStack.isInvalidAmount()) {
                 input.removeKey(randomStack.getDefinition());
             }
             double mass = Math.abs(randomStack.getDefinition().getMass()) * amountToRemove;
diff --git a/src/main/java/com/github/technus/tectech/util/DoubleCount.java b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
index 576123079c..f5c391ab43 100644
--- a/src/main/java/com/github/technus/tectech/util/DoubleCount.java
+++ b/src/main/java/com/github/technus/tectech/util/DoubleCount.java
@@ -102,6 +102,9 @@ public class DoubleCount {
             return count - value;
         } else {
             double result = count - value;
+            if(result==count||result==value){
+                return result;
+            }
             return result - ulpSigned(result);
         }
     }
@@ -111,6 +114,9 @@ public class DoubleCount {
             return count + value;
         } else {
             double result = count + value;
+            if(result==count||result==value){
+                return result;
+            }
             return result - ulpSigned(result);
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/util/Util.java b/src/main/java/com/github/technus/tectech/util/Util.java
index 1843770e3a..78522a2ae8 100644
--- a/src/main/java/com/github/technus/tectech/util/Util.java
+++ b/src/main/java/com/github/technus/tectech/util/Util.java
@@ -561,4 +561,16 @@ public final class Util {
         int z=chunk.zPosition<<4;
         return AxisAlignedBB.getBoundingBox(x,-128,z,x+16,512,z+16);
     }
+
+    public static String getConcated(String[] strings,String separator){
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String string : strings) {
+            stringBuilder.append(string).append(separator);
+        }
+        int length = stringBuilder.length();
+        if(length >=separator.length()){
+            stringBuilder.setLength(length -separator.length());
+        }
+        return stringBuilder.toString();
+    }
 }
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index adec911faa..07c06fd323 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -798,20 +798,17 @@ gt.blockmachines.debug.tt.writer.desc.2=ABC axises aligned to machine front
 tt.keyword.ID=ID
 #Example: 32EU at 1A
 tt.keyword.at=at
-#These are Thaumcraft aspects
-tt.keyword.Air=Air
-tt.keyword.Earth=Earth
-tt.keyword.Fire=Fire
-tt.keyword.Water=Water
-tt.keyword.Order=Order
-tt.keyword.Entropy=Entropy
-tt.keyword.Primal=Primal
-tt.keyword.Aspect=Aspect
+#EM scan result
 tt.keyword.CLASS=CLASS
 tt.keyword.NAME=NAME
 tt.keyword.CHARGE=CHARGE
 tt.keyword.COLORLESS=COLORLESS
 tt.keyword.MASS=MASS
+tt.keyphrase.LIFE_TIME=LIFE TIME
+tt.keyphrase.CARRIES_COLOR=CARRIES COLOR
+tt.keyphrase.Hint_Details=Hint Details
+tt.keyphrase.At_current_energy_level=At current energy level
+#debug boom
 tt.keyword.BOOM=BOOM!
 tt.keyword.Destination=Destination
 tt.keyword.Weight=Weight
@@ -834,10 +831,6 @@ tt.keyword.Status=Status
 tt.keyword.Content=Content
 tt.keyword.PacketHistory=PacketHistory
 
-tt.keyphrase.LIFE_TIME=LIFE TIME
-tt.keyphrase.CARRIES_COLOR=CARRIES COLOR
-tt.keyphrase.Hint_Details=Hint Details
-tt.keyphrase.At_current_energy_level=At current energy level
 #Used when 0 Elemental Matter Stacks
 tt.keyphrase.No_Stacks=No Stacks
 tt.keyphrase.Contains_EM=Contains EM
@@ -875,3 +868,87 @@ tt.keyphrase.Side_capabilities=Side capabilities
 #OpenTurrets compatibility
 tile.turretHeadEM.name=Elemental Matter Turret
 tile.turretBaseEM.name=Elemental Turret Base
+
+tt.keyword.mol=mol
+tt.keyword.itemMols=items
+tt.keyword.mbMols=mb
+#EM types
+tt.keyword.Primitive=Primitive
+tt.keyword.Element=Element
+tt.keyword.Atom=Atom
+tt.keyword.Isotope=Isotope
+tt.keyword.Boson=Boson
+tt.keyword.Fermion=Fermion
+tt.keyword.GaugeBoson=Gauge boson
+tt.keyword.Meson=Meson
+tt.keyword.Baryon=Baryon
+tt.keyword.Tetraquark=Tetraquark
+tt.keyword.Pentaquark=Pentaquark
+tt.keyword.Hexaquark=Hexaquark
+tt.keyword.Hadron=Hadron
+tt.keyword.Neutrino=Neutrino
+tt.keyword.Quark=Quark
+tt.keyword.ScalarBoson=Scalar boson
+#em definitions
+tt.keyword.PrimitiveNBTERROR=NBT ERROR
+tt.keyword.PrimitiveNULLPOINTER=NULL POINTER
+tt.keyword.PrimitiveSpace=Space
+tt.keyword.PrimitivePresence=Presence
+tt.keyword.PrimitiveMass=Mass
+tt.keyword.PrimitiveDarkMass=DarkMass
+tt.keyword.PrimitiveEnergy=Energy
+tt.keyword.PrimitiveDarkEnergy=DarkEnergy
+tt.keyword.PrimitiveMagic=Magic
+tt.keyword.PrimitiveAntimagic=Antimagic
+tt.keyword.Gluon=Gluon
+tt.keyword.Photon=Photon
+tt.keyword.Weak0=Weak
+tt.keyword.WeakPlus=Weak+
+tt.keyword.WeakMinus=Weak-
+tt.keyword.Proton=Proton
+tt.keyword.AntiProton=Antiproton
+tt.keyword.Neutron=Neutron
+tt.keyword.AntiNeutron=Antineutron
+tt.keyword.Lepton=Lepton
+tt.keyword.Electron=Electron
+tt.keyword.Muon=Muon
+tt.keyword.Tauon=Tauon
+tt.keyword.Positron=Positron
+tt.keyword.Antimuon=Antimuon
+tt.keyword.Antitauon=Antitauon
+tt.keyword.ElectronNeutrino=Electron neutrino
+tt.keyword.MuonNeutrino=Muon neutrino
+tt.keyword.TauonNeutrino=Tauon neutrino
+tt.keyword.PositronNeutrino=Positron neutrino
+tt.keyword.AntimuonNeutrino=Antimuon neutrino
+tt.keyword.AntitauonNeutrino=Antitauon neutrino
+tt.keyword.QuarkUp=Up
+tt.keyword.QuarkCharm=Charm
+tt.keyword.QuarkTop=Top
+tt.keyword.QuarkDown=Down
+tt.keyword.QuarkStrange=Strange
+tt.keyword.QuarkBottom=Bottom
+tt.keyword.QuarkAntiUp=Antiup
+tt.keyword.QuarkAntiCharm=Anticharm
+tt.keyword.QuarkAntiTop=Antitop
+tt.keyword.QuarkAntiDown=Antidown
+tt.keyword.QuarkAntiStrange=Antistrange
+tt.keyword.QuarkAntiBottom=Antibottom
+tt.keyword.Higgs=Higgs
+#These are Thaumcraft aspects
+tt.keyword.Air=Air
+tt.keyword.Earth=Earth
+tt.keyword.Fire=Fire
+tt.keyword.Water=Water
+tt.keyword.Order=Order
+tt.keyword.Entropy=Entropy
+tt.keyword.Chaos=Chaos
+
+tt.keyword.Primal=Primal
+tt.keyword.Aspect=Aspect
+
+
+
+
+
+
-- 
cgit 


From ab9e1f082243953f982e07e8e95b97b2aa4fabb8 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 23 Jan 2022 13:44:18 +0100
Subject: Fix autocompletion for EM commands

(cherry picked from commit e37d21d8141e82eee9d87d4bb137c44977db8625)
---
 .../mechanics/elementalMatter/core/commands/EMGive.java     |  2 +-
 .../mechanics/elementalMatter/core/commands/EMList.java     | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
index 18f2f76498..4824053668 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMGive.java
@@ -117,7 +117,7 @@ public class EMGive implements ICommand {
 
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if (args.length > 1 && args.length % 2 == 0) {
+        if (args.length > 2 && args.length % 2 == 1) {
             return new ArrayList<>(TecTech.definitionsRegistry.getBinds().keySet());
         }
         return null;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
index 90eddf1e23..fe542abbde 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -28,15 +28,16 @@ public class EMList implements ICommand {
             if(args.length == 0) {
                 listClasses(sender);
             }else {
-                listDefinitions(sender, Util.getConcated(args," "));
+                String concated = Util.getConcated(args, " ");
+                listDefinitions(sender,concated, concated.replaceAll(" ","_"),concated.replaceAll("_"," "));
             }
         }
     }
 
-    private void listDefinitions(ICommandSender sender, String arg) {
+    private void listDefinitions(ICommandSender sender,String raw, String unlocalized,String localized) {
         sender.addChatMessage(new ChatComponentText("    Available Direct: tag - name symbol"));
         for (EMType directType : TecTech.definitionsRegistry.getDirectTypes().values()) {
-            if ("*".equals(arg) || arg.equalsIgnoreCase(directType.getLocalizedName())) {
+            if ("*".equals(raw) || localized.equalsIgnoreCase(directType.getLocalizedName()) || unlocalized.equalsIgnoreCase(directType.getUnlocalizedName())) {
                 directType.getDefinitions().forEach((bind, definition) ->
                         sender.addChatMessage(new ChatComponentText(bind + " - " + definition.getLocalizedName() + " " + definition.getSymbol())));
             }
@@ -44,7 +45,7 @@ public class EMList implements ICommand {
     }
 
     private void listClasses(ICommandSender sender) {
-        sender.addChatMessage(new ChatComponentText("    Available Direct: name (use name as parameter to learn more"));
+        sender.addChatMessage(new ChatComponentText("    Available Direct: name (use as parameter to learn more"));
         TecTech.definitionsRegistry.getDirectTypes().forEach((aClass, emDirectType) ->
                 sender.addChatMessage(new ChatComponentText(emDirectType.getLocalizedName())));
         sender.addChatMessage(new ChatComponentText("    Available Indirect: tag - name"));
@@ -69,8 +70,8 @@ public class EMList implements ICommand {
 
     @Override
     public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
-        if(args.length==0){
-            return TecTech.definitionsRegistry.getDirectTypes().values().stream().map(EMType::getLocalizedName).collect(Collectors.toList());
+        if(args.length==1){
+            return TecTech.definitionsRegistry.getDirectTypes().values().stream().map(EMType::getLocalizedName).map(s->s.replaceAll(" ","_")).collect(Collectors.toList());
         }
         return null;
     }
-- 
cgit 


From ad188c2a0680d0af56076bd2097e9aa95ecfe900 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 23 Jan 2022 14:47:42 +0100
Subject: Separate EM to new tab

(cherry picked from commit caff4351909ce59637348c6be94271cf1d1c0a9c)
---
 src/main/java/com/github/technus/tectech/TecTech.java |  4 +++-
 .../com/github/technus/tectech/loader/MainLoader.java |  2 ++
 .../technus/tectech/loader/gui/CreativeTabEM.java     | 19 +++++++++++++++++++
 .../technus/tectech/mechanics/elementalMatter/README  |  5 ++++-
 .../elementalMatter/core/maps/EMInstanceStackMap.java |  5 -----
 .../item/DebugElementalInstanceContainer_EM.java      |  4 ++--
 .../thing/item/ElementalDefinitionContainer_EM.java   | 10 +++++-----
 .../thing/item/ElementalDefinitionScanStorage_EM.java |  4 ++--
 .../GT_MetaTileEntity_Hatch_ElementalContainer.java   |  4 ++--
 src/main/resources/assets/tectech/lang/en_US.lang     |  1 +
 10 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index d730d64a65..10b8f69b1a 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -3,6 +3,7 @@ package com.github.technus.tectech;
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.TecTechConfig;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
+import com.github.technus.tectech.loader.gui.CreativeTabEM;
 import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler;
 import com.github.technus.tectech.mechanics.anomaly.CancerCommand;
 import com.github.technus.tectech.mechanics.anomaly.ChargeCommand;
@@ -45,7 +46,8 @@ public class TecTech {
 
     public static final XSTR RANDOM = XSTR.XSTR_INSTANCE;
     public static final LogHelper          LOGGER = new LogHelper(Reference.MODID);
-    public static       CreativeTabTecTech creativeTabTecTech;
+    public static CreativeTabTecTech creativeTabTecTech;
+    public static CreativeTabEM      creativeTabEM;
 
     private static IngameErrorLog moduleAdminErrorLogs;
     public static TecTechConfig configTecTech;
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index e2f1e2882f..b9d737f98a 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.trans
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat;
 import com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompatEnabled;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
+import com.github.technus.tectech.loader.gui.CreativeTabEM;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
 import com.github.technus.tectech.loader.recipe.BaseRecipeLoader;
 import com.github.technus.tectech.loader.thing.ComponentLoader;
@@ -64,6 +65,7 @@ public final class MainLoader {
 
     public static void preLoad(){
         creativeTabTecTech =new CreativeTabTecTech("TecTech");
+        creativeTabEM =new CreativeTabEM("EM");
 
         //set expanded texture arrays for tiers
         try {
diff --git a/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java
new file mode 100644
index 0000000000..cd73d1e420
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/loader/gui/CreativeTabEM.java
@@ -0,0 +1,19 @@
+package com.github.technus.tectech.loader.gui;
+
+import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
+
+public class CreativeTabEM extends CreativeTabs {
+    public CreativeTabEM(String name) {
+        super(name);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public Item getTabIconItem() {
+        return ElementalDefinitionContainer_EM.INSTANCE;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README
index f6c0b35e5f..c774b126c8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/README
@@ -41,4 +41,7 @@ Trees:
 
  InstanceStack - inst stack
  |||||multiple to 1
- InstanceStackTree - inst container - real things go here
\ No newline at end of file
+ InstanceStackTree - inst container - real things go here
+
+ Preset for world:
+ 2;7,16x22,16x35:11,16x35:3,16x35;0;
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
index 64ff7063e8..265d219168 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -117,11 +117,6 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return list;
     }
 
-    //Tick Content
-    public double tickContentByOneSecond(double lifeTimeMult, int postEnergize) {
-        return tickContent(lifeTimeMult,postEnergize,1D);
-    }
-
     public double tickContent(double lifeTimeMult, int postEnergize, double seconds){
         //cleanUp();
         double diff=0;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index d909054196..ecebc6afcd 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -29,8 +29,8 @@ import java.util.Collections;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.TecTech.creativeTabEM;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.*;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
@@ -46,7 +46,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         setMaxStackSize(1);
         setUnlocalizedName("em.debugContainer");
         setTextureName(MODID + ":itemDebugContainer");
-        setCreativeTab(creativeTabTecTech);
+        setCreativeTab(creativeTabEM);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index f0f59e0e86..0de8bb007a 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.item;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
+import com.github.technus.tectech.util.CommonValues;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.gui.FontRenderer;
@@ -20,8 +20,8 @@ import java.util.Collections;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.TecTech.creativeTabEM;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static cpw.mods.fml.relauncher.Side.CLIENT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -35,7 +35,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         setMaxStackSize(1);
         setUnlocalizedName("em.definitionContainer");
         setTextureName(MODID + ":itemDefinitionContainer");
-        setCreativeTab(creativeTabTecTech);
+        setCreativeTab(creativeTabEM);
     }
 
     //return previous thing
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index 8b8133a1e2..1cb6de1df6 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -1,13 +1,13 @@
 package com.github.technus.tectech.thing.item;
 
-import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
 import com.github.technus.tectech.loader.gui.ModGuiHandler;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
+import com.github.technus.tectech.util.CommonValues;
+import com.github.technus.tectech.util.Util;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 84f18ad2bf..6cb83f5d46 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -112,7 +112,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
             byte Tick = (byte) (aTick % 20);
             if (DECAY_AT == Tick) {
                 purgeOverflow();
-                content.tickContentByOneSecond(1, postEnergize);//Hatches don't life time mult things
+                content.tickContent(1, postEnergize,1);//Hatches don't life time mult things
                 purgeOverflow();
             } else if (OVERFLOW_AT == Tick) {
                 if (overflowMatter <= 0) {
@@ -206,7 +206,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
     }
 
     public int getMaxStacksCount() {
-        return mTier * 128;
+        return mTier * mTier >> 4;
     }
 
     public double getMaxStackSize() {
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 07c06fd323..3142d87d16 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -1,5 +1,6 @@
 #Creative Tab Name
 itemGroup.TecTech=TecTech Interdimensional
+itemGroup.EM=TecTech Elemental Matter
 
 #Blocks
 tile.quantumStuff.name=Quantum Stuff
-- 
cgit 


From a3286688012b742015e97b78420e9768e24a8299 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 27 Jan 2022 22:09:30 +0100
Subject: Cleanup Atoms Localization, and FontRenderer

(cherry picked from commit 7adcaf6d9b4a8628711a01ce2467f13582cea7d5)
---
 .../technus/tectech/font/TecTechFontRender.java    | 240 ++++++++++++------
 .../definitions/complex/EMAtomDefinition.java      | 113 ++++-----
 .../item/DebugElementalInstanceContainer_EM.java   |   9 +-
 src/main/resources/META-INF/tectech_at.cfg         |  17 +-
 src/main/resources/assets/tectech/lang/en_US.lang  | 268 ++++++++++++++++++++-
 5 files changed, 498 insertions(+), 149 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
index 4aea8bce92..fbbc12fe36 100644
--- a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
+++ b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
@@ -1,85 +1,182 @@
 package com.github.technus.tectech.font;
 
+import com.ibm.icu.text.ArabicShaping;
+import com.ibm.icu.text.ArabicShapingException;
+import com.ibm.icu.text.Bidi;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.settings.GameSettings;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 @SideOnly(Side.CLIENT)
 public class TecTechFontRender extends FontRenderer {
     public static final TecTechFontRender INSTANCE = new TecTechFontRender();
 
-    private static float DISTANCE_L = .125F;
-    private static float DISTANCE_L2 = DISTANCE_L *2F;
+    private static float DISTANCE_L  = .125F;
+    private static float DISTANCE_L2 = DISTANCE_L * 2F;
 
-    private static float DISTANCE_M = 0.06F;
-    private static float DISTANCE_M2 = DISTANCE_M *2F;
+    private static float DISTANCE_M  = 0.06F;
+    private static float DISTANCE_M2 = DISTANCE_M * 2F;
 
-    private static float DISTANCE_A = 0.06F;
-    private static float DISTANCE_A2 = DISTANCE_A *2F;
+    private static float DISTANCE_A  = 0.06F;
+    private static float DISTANCE_A2 = DISTANCE_A * 2F;
 
-    private static final Method reset;
-    private static final Method render;
 
-    private final GameSettings gameSettings;
+    private TecTechFontRender() {
+        super(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false);
+    }
 
-    static {
-        Method resetMethod,renderMethod;
-        try {
-            resetMethod =FontRenderer.class.getDeclaredMethod("resetStyles");
-            renderMethod=FontRenderer.class.getDeclaredMethod("renderString", String.class, int.class, int.class, int.class, boolean.class);
-        } catch (NoSuchMethodException e) {
-            try {
-                resetMethod =FontRenderer.class.getDeclaredMethod("func_78265_b");
-                renderMethod=FontRenderer.class.getDeclaredMethod("func_78258_a", String.class, int.class, int.class, int.class, boolean.class);
-            } catch (NoSuchMethodException ex) {
-                throw new RuntimeException("Cannot get methods!",ex);
-            }
-        }
-        resetMethod.setAccessible(true);
-        renderMethod.setAccessible(true);
-        reset=resetMethod;
-        render=renderMethod;
+    private void resetStyles() {
+        this.randomStyle = false;
+        this.boldStyle = false;
+        this.italicStyle = false;
+        this.underlineStyle = false;
+        this.strikethroughStyle = false;
     }
 
-    private TecTechFontRender() {
-        super(Minecraft.getMinecraft().gameSettings, new ResourceLocation("textures/font/ascii.png"), Minecraft.getMinecraft().renderEngine, false);
-        gameSettings = Minecraft.getMinecraft().gameSettings;
+    private int renderString(String p_78258_1_, int p_78258_2_, int p_78258_3_, int p_78258_4_, boolean p_78258_5_) {
+        if (p_78258_1_ == null) {
+            return 0;
+        } else {
+            if (this.bidiFlag) {
+                p_78258_1_ = this.bidiReorder(p_78258_1_);
+            }
+
+            if ((p_78258_4_ & -67108864) == 0) {
+                p_78258_4_ |= -16777216;
+            }
+
+            if (p_78258_5_) {
+                p_78258_4_ = (p_78258_4_ & 16579836) >> 2 | p_78258_4_ & -16777216;
+            }
+
+            this.red = (float)(p_78258_4_ >> 16 & 255) / 255.0F;
+            this.blue = (float)(p_78258_4_ >> 8 & 255) / 255.0F;
+            this.green = (float)(p_78258_4_ & 255) / 255.0F;
+            this.alpha = (float)(p_78258_4_ >> 24 & 255) / 255.0F;
+            this.setColor(this.red, this.blue, this.green, this.alpha);
+            this.posX = (float)p_78258_2_;
+            this.posY = (float)p_78258_3_;
+            this.renderStringAtPos(p_78258_1_, p_78258_5_);
+            return (int)this.posX;
+        }
     }
 
-    private void resetStyles2(){
+    private String bidiReorder(String p_147647_1_) {
         try {
-            reset.invoke(this);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException("Cannot run method resetStyles!",e);
+            Bidi bidi = new Bidi((new ArabicShaping(8)).shape(p_147647_1_), 127);
+            bidi.setReorderingMode(0);
+            return bidi.writeReordered(2);
+        } catch (ArabicShapingException var3) {
+            return p_147647_1_;
         }
     }
 
-    private int renderString2(String str, int x, int y, int color, boolean dropShadow){
-        try {
-            return (int)render.invoke(this,str,x,y,color,dropShadow);
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException("Cannot run method renderString!",e);
+    private void renderStringAtPos(String p_78255_1_, boolean p_78255_2_) {
+        for(int i = 0; i < p_78255_1_.length(); ++i) {
+            char c0 = p_78255_1_.charAt(i);
+            int j;
+            int k;
+            if (c0 == 167 && i + 1 < p_78255_1_.length()) {
+                j = "0123456789abcdefklmnor".indexOf(p_78255_1_.toLowerCase().charAt(i + 1));
+                if (j < 16) {
+                    this.randomStyle = false;
+                    this.boldStyle = false;
+                    this.strikethroughStyle = false;
+                    this.underlineStyle = false;
+                    this.italicStyle = false;
+                    if (j < 0 || j > 15) {
+                        j = 15;
+                    }
+
+                    if (p_78255_2_) {
+                        j += 16;
+                    }
+
+                    k = this.colorCode[j];
+                    this.textColor = k;
+                    this.setColor((float)(k >> 16) / 255.0F, (float)(k >> 8 & 255) / 255.0F, (float)(k & 255) / 255.0F, this.alpha);
+                } else if (j == 16) {
+                    this.randomStyle = true;
+                } else if (j == 17) {
+                    this.boldStyle = true;
+                } else if (j == 18) {
+                    this.strikethroughStyle = true;
+                } else if (j == 19) {
+                    this.underlineStyle = true;
+                } else if (j == 20) {
+                    this.italicStyle = true;
+                } else if (j == 21) {
+                    this.randomStyle = false;
+                    this.boldStyle = false;
+                    this.strikethroughStyle = false;
+                    this.underlineStyle = false;
+                    this.italicStyle = false;
+                    this.setColor(this.red, this.blue, this.green, this.alpha);
+                }
+
+                ++i;
+            } else {
+                j = "ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u0000".indexOf(c0);
+                if (this.randomStyle && j != -1) {
+                    do {
+                        k = this.fontRandom.nextInt(this.charWidth.length);
+                    } while(this.charWidth[j] != this.charWidth[k]);
+
+                    j = k;
+                }
+
+                float f1 = this.unicodeFlag ? 0.5F : 1.0F;
+                boolean flag1 = (c0 == 0 || j == -1 || this.unicodeFlag) && p_78255_2_;
+                if (flag1) {
+                    this.posX -= f1;
+                    this.posY -= f1;
+                }
+
+                float f = this.renderCharAtPos(j, c0, this.italicStyle);
+                if (flag1) {
+                    this.posX += f1;
+                    this.posY += f1;
+                }
+
+                if (this.boldStyle) {
+                    this.posX += f1;
+                    if (flag1) {
+                        this.posX -= f1;
+                        this.posY -= f1;
+                    }
+
+                    this.renderCharAtPos(j, c0, this.italicStyle);
+                    this.posX -= f1;
+                    if (flag1) {
+                        this.posX += f1;
+                        this.posY += f1;
+                    }
+
+                    ++f;
+                }
+
+                this.doDraw(f);
+            }
         }
+
     }
 
+    private float renderCharAtPos(int p_78278_1_, char p_78278_2_, boolean p_78278_3_) {
+        return p_78278_2_ == ' ' ? 4.0F : ("ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u0000".indexOf(p_78278_2_) != -1 && !this.unicodeFlag ? this.renderDefaultChar(p_78278_1_, p_78278_3_) : this.renderUnicodeChar(p_78278_2_, p_78278_3_));
+    }
 
     @Override
     public int drawString(String str, int x, int y, int color, boolean dropShadow) {
-        switch (gameSettings.guiScale){
+        switch (Minecraft.getMinecraft().gameSettings.guiScale) {
             case 0:
                 setUnicodeFlag(true);
                 y--;
                 GL11.glPushMatrix();
 
-                if (dropShadow)
-                {
+                if (dropShadow) {
                     GL11.glTranslatef(DISTANCE_A, DISTANCE_A, 0F);
                     drawStringBack(str, x, y, color);
                     GL11.glTranslatef(-DISTANCE_A2, 0, 0F);
@@ -106,8 +203,7 @@ public class TecTechFontRender extends FontRenderer {
                 y--;
                 GL11.glPushMatrix();
 
-                if (dropShadow)
-                {
+                if (dropShadow) {
                     GL11.glTranslatef(DISTANCE_M, DISTANCE_M, 0F);
                     drawStringBack(str, x, y, color);
                     GL11.glTranslatef(-DISTANCE_M2, 0, 0F);
@@ -132,8 +228,7 @@ public class TecTechFontRender extends FontRenderer {
                 y--;
                 GL11.glPushMatrix();
 
-                if (dropShadow)
-                {
+                if (dropShadow) {
                     GL11.glTranslatef(DISTANCE_L, DISTANCE_L, 0F);
                     drawStringBack(str, x, y, color);
                     GL11.glTranslatef(-DISTANCE_L2, 0, 0F);
@@ -159,7 +254,7 @@ public class TecTechFontRender extends FontRenderer {
 
     @Override
     public void drawSplitString(String str, int x, int y, int maxWidth, int color) {
-        switch (gameSettings.guiScale){
+        switch (Minecraft.getMinecraft().gameSettings.guiScale) {
             case 0:
                 setUnicodeFlag(true);
                 y--;
@@ -213,50 +308,40 @@ public class TecTechFontRender extends FontRenderer {
 
     private int drawStringFront(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_) {
         GL11.glEnable(3008);
-        resetStyles2();
-        return renderString2(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false);
+        resetStyles();
+        return renderString(p_85187_1_, p_85187_2_, p_85187_3_, p_85187_4_, false);
     }
 
     private int drawStringBack(String p_85187_1_, int p_85187_2_, int p_85187_3_, int p_85187_4_) {
         GL11.glEnable(3008);
-        resetStyles2();
-        return renderString2(p_85187_1_, p_85187_2_ + 1, p_85187_3_ + 1, p_85187_4_, true);
+        resetStyles();
+        return renderString(p_85187_1_, p_85187_2_ + 1, p_85187_3_ + 1, p_85187_4_, true);
     }
 
     @Override
-    public int getStringWidth(String p_78256_1_)
-    {
-        if(gameSettings.guiScale==1){
+    public int getStringWidth(String p_78256_1_) {
+        if (Minecraft.getMinecraft().gameSettings.guiScale == 1) {
             return Minecraft.getMinecraft().fontRenderer.getStringWidth(p_78256_1_);
         }
-        if (p_78256_1_ == null)
-        {
+        if (p_78256_1_ == null) {
             return 0;
-        }
-        else
-        {
-            int i = 0;
+        } else {
+            int     i    = 0;
             boolean flag = false;
 
-            for (int j = 0; j < p_78256_1_.length(); ++j)
-            {
+            for (int j = 0; j < p_78256_1_.length(); ++j) {
                 char c0 = p_78256_1_.charAt(j);
-                int k = this.getCharWidth(c0);
+                int  k  = this.getCharWidth(c0);
 
-                if (k < 0 && j < p_78256_1_.length() - 1)
-                {
+                if (k < 0 && j < p_78256_1_.length() - 1) {
                     ++j;
                     c0 = p_78256_1_.charAt(j);
 
-                    if (c0 != 108 && c0 != 76)
-                    {
-                        if (c0 == 114 || c0 == 82)
-                        {
+                    if (c0 != 108 && c0 != 76) {
+                        if (c0 == 114 || c0 == 82) {
                             flag = false;
                         }
-                    }
-                    else
-                    {
+                    } else {
                         flag = true;
                     }
 
@@ -265,8 +350,7 @@ public class TecTechFontRender extends FontRenderer {
 
                 i += k;
 
-                if (flag && k > 0)
-                {
+                if (flag && k > 0) {
                     ++i;
                 }
             }
@@ -274,4 +358,6 @@ public class TecTechFontRender extends FontRenderer {
             return i;
         }
     }
+
+
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 76f4457e94..49fd8b5b54 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -5,8 +5,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecay;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMComplexTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMIndirectType;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
@@ -27,12 +27,17 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE
 import static com.github.technus.tectech.util.XSTR.XSTR_INSTANCE;
 import static gregtech.api.enums.Materials.*;
 import static gregtech.api.enums.OrePrefixes.dust;
+import static java.lang.Math.abs;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 18.11.2016.
  */
 public class EMAtomDefinition extends EMComplexTemplate {
+    private static final String[] SYMBOL       = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
+    private static final String[] NAME         = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
+    private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
+
     public static final  long ATOM_COMPLEXITY_LIMIT = 65536L;
     private static final byte BYTE_OFFSET           = 32;
 
@@ -118,7 +123,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
             if (def.getGeneration() < 0) {
                 containsAnti = true;
             }
-            type = Math.max(type, Math.abs(def.getGeneration()));
+            type = Math.max(type, abs(def.getGeneration()));
 
             if (def instanceof EMLeptonDefinition) {
                 cLeptons += stack.getCharge();
@@ -140,12 +145,12 @@ public class EMAtomDefinition extends EMComplexTemplate {
         this.neutralCount = neutralCount;
         this.element = element;
 
-        element = Math.abs(element);
+        element = abs(element);
 
         //stability curve
         int StableIsotope = stableIzoCurve(element);
         int izoDiff       = neutralCount - StableIsotope;
-        int izoDiffAbs    = Math.abs(izoDiff);
+        int izoDiffAbs    = abs(izoDiff);
 
         xstr.setSeed((element + 1L) * (neutralCount + 100L));
         iaea = EMNuclideIAEA.get(element, neutralCount);
@@ -215,7 +220,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
             if (element == 0) {
                 return 1e-35D;
             } else if (element == 1) {
-                unstabilityEXP = 1.743D - Math.abs(izoDiff - 1) * 9.743D;
+                unstabilityEXP = 1.743D - abs(izoDiff - 1) * 9.743D;
             } else if (element == 2) {
                 switch (isotope) {
                     case 4:
@@ -234,9 +239,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
             } else if (element <= 83 || isotope <= 127 && element <= 120) {
                 double elementPow4 = Math.pow(element, 4);
 
-                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - Math.abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
+                unstabilityEXP = Math.min(element / 2.4D, 6 + ((element + 1) % 2) * 3e6D / elementPow4) + -izoDiff * elementPow4 / 1e8D - abs(izoDiff - 1 + element / 60D) * (3D - element / 12.5D + element * element / 1500D);
             } else if (element < 180) {
-                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - Math.abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
+                unstabilityEXP = Math.min((element - 85) * 2, 16 + ((isotope + 1) % 2) * 2.5D - (element - 85) / 3D) - abs(izoDiff) * (3D - element / 13D + element * element / 1600D);
             } else {
                 return -1;
             }
@@ -334,63 +339,51 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public String getLocalizedName() {
-        int     element  = Math.abs(this.getElement());
-        boolean negative = this.getElement() < 0;
-        try {
-            if (Math.abs(getGeneration()) != 1) {
-                return (negative ? "~? " : "? ") + Nomenclature.NAME[element];
-            }
-            return negative ? '~' + Nomenclature.NAME[element] : Nomenclature.NAME[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
+        int     element  = abs(this.getElement());
+        boolean anti = this.getElement() < 0;
+        boolean weird = abs(getGeneration()) != 1;
+        if(element>=NAME.length){
+            StringBuilder s = new StringBuilder();
+            if(anti){
+                s.append(translateToLocal("tt.IUPAC.Anti"));
+                do {
+                    s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element % 10]));
+                    element = element / 10;
+                } while (element > 0);
+            }else {
+                while (element >= 10) {
+                    s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element % 10]));
+                    element = element / 10;
+                }
+                s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element + 10]));
             }
-            return translateToLocal("tt.keyword.Element") + (negative ? ": ~" : ": ") + element;
+            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            return s.toString();
         }
+        return translateToLocal("tt.element."+(anti?"Anti":"")+NAME[element])+(weird?translateToLocal("tt.keyword.Weird"):"");
     }
 
     @Override
     public String getSymbol() {
-        int     element  = Math.abs(this.getElement());
-        boolean negative = this.getElement() < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1] + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "? N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
-            }
-        }
+        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
     }
 
     @Override
     public String getShortSymbol() {
-        int     element  = Math.abs(this.getElement());
-        boolean negative = this.getElement() < 0;
-        try {
-            return (negative ? "~" : "") + Nomenclature.SYMBOL[element];
-        } catch (Exception e) {
-            if (DEBUG_MODE) {
-                e.printStackTrace();
-            }
-            try {
-                int s100 = element / 100, s1 = element / 10 % 10, s10 = element % 10;
-                return (negative ? "~" : "") + Nomenclature.SYMBOL_IUPAC[10 + s100] + Nomenclature.SYMBOL_IUPAC[s10] + Nomenclature.SYMBOL_IUPAC[s1];
-            } catch (Exception E) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
-                return (negative ? "~" : "") + "?";
-            }
+        int     element  = abs(this.getElement());
+        boolean anti = this.getElement() < 0;
+        boolean weird = abs(getGeneration()) != 1;
+        if(element>=SYMBOL.length){
+            StringBuilder s = new StringBuilder(anti?"~":"");
+            while (element >= 10) {
+                s.append(SYMBOL_IUPAC[element % 10]);
+                element = element / 10;
+            }
+            s.append(SYMBOL_IUPAC[element + 10]);
+            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            return s.toString();
         }
+        return (anti?"~":"")+SYMBOL[element]+(weird?translateToLocal("tt.keyword.Weird"):"");
     }
 
     @Override
@@ -1133,7 +1126,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     private boolean Fission(ArrayList<EMDecay> decaysList, EMDefinitionStackMap fissile, EMDefinitionStackMap particles, double probability, boolean spontaneousCheck) {
         EMDefinitionStackMap heavy      = new EMDefinitionStackMap();
-        double[]             liquidDrop = liquidDropFunction(Math.abs(getElement()) <= 97);
+        double[]             liquidDrop = liquidDropFunction(abs(getElement()) <= 97);
 
         for (EMDefinitionStack stack : fissile.valuesToArray()) {
             if (spontaneousCheck && stack.getDefinition() instanceof EMHadronDefinition &&
@@ -1226,7 +1219,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 return decays.toArray(EMDecay.NO_PRODUCT);
             }
         }
-        if (energyLevel < Math.abs(getCharge()) / 3 + getNeutralCount()) {
+        if (energyLevel < abs(getCharge()) / 3 + getNeutralCount()) {
             return new EMDecay[]{new EMDecay(1, this, boson_Y__)};
         }
         return getNaturalDecayInstant();
@@ -1363,12 +1356,6 @@ public class EMAtomDefinition extends EMComplexTemplate {
         return element;
     }
 
-    private static final class Nomenclature {
-        private static final String[] SYMBOL       = new String[]{"Nt", "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hg", "Tl", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Md", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Cn", "Nh", "Fl", "Mc", "Lv", "Ts", "Og"};
-        private static final String[] NAME         = new String[]{"Neutronium", "Hydrogen", "Helium", "Lithium", "Beryllium", "Boron", "Carbon", "Nitrogen", "Oxygen", "Fluorine", "Neon", "Sodium", "Magnesium", "Aluminium", "Silicon", "Phosphorus", "Sulfur", "Chlorine", "Argon", "Potassium", "Calcium", "Scandium", "Titanium", "Vanadium", "Chromium", "Manganese", "Iron", "Cobalt", "Nickel", "Copper", "Zinc", "Gallium", "Germanium", "Arsenic", "Selenium", "Bromine", "Krypton", "Rubidium", "Strontium", "Yttrium", "Zirconium", "Niobium", "Molybdenum", "Technetium", "Ruthenium", "Rhodium", "Palladium", "Silver", "Cadmium", "Indium", "Tin", "Antimony", "Tellurium", "Iodine", "Xenon", "Caesium", "Barium", "Lanthanum", "Cerium", "Praseodymium", "Neodymium", "Promethium", "Samarium", "Europium", "Gadolinium", "Terbium", "Dysprosium", "Holmium", "Erbium", "Thulium", "Ytterbium", "Lutetium", "Hafnium", "Tantalum", "Tungsten", "Rhenium", "Osmium", "Iridium", "Platinum", "Gold", "Mercury", "Thallium", "Lead", "Bismuth", "Polonium", "Astatine", "Radon", "Francium", "Radium", "Actinium", "Thorium", "Protactinium", "Uranium", "Neptunium", "Plutonium", "Americium", "Curium", "Berkelium", "Californium", "Einsteinium", "Fermium", "Mendelevium", "Nobelium", "Lawrencium", "Rutherfordium", "Dubnium", "Seaborgium", "Bohrium", "Hassium", "Meitnerium", "Darmstadtium", "Roentgenium", "Copernicium", "Nihonium", "Flerovium", "Moscovium", "Livermorium", "Tennessine", "Oganesson"};
-        private static final String[] SYMBOL_IUPAC = new String[]{"n", "u", "b", "t", "q", "p", "h", "s", "o", "e", "N", "U", "B", "T", "Q", "P", "H", "S", "O", "E"};
-    }
-
     @Override
     protected String getIndirectTagValue() {
         return nbtType;
@@ -1398,7 +1385,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 //stability curve
                 int           StableIsotope = stableIzoCurve(element);
                 int           izoDiff       = isotope - StableIsotope;
-                int           izoDiffAbs    = Math.abs(izoDiff);
+                int           izoDiffAbs    = abs(izoDiff);
                 double        rawLifeTime   = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
                 EMNuclideIAEA nuclide       = EMNuclideIAEA.get(element, isotope);
                 if (rawLifeTime >= STABLE_RAW_LIFE_TIME || nuclide != null && nuclide.getHalfTime() >= STABLE_RAW_LIFE_TIME) {
@@ -1415,7 +1402,7 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 //stability curve
                 int                      Isotope     = stableIzoCurve(element);
                 int                      izoDiff     = isotope - Isotope;
-                int                      izoDiffAbs  = Math.abs(izoDiff);
+                int                      izoDiffAbs  = abs(izoDiff);
                 double                   rawLifeTime = calculateLifeTime(izoDiff, izoDiffAbs, element, isotope, false);
                 TreeMap<Double, Integer> isotopes    = mostStableUnstableIsotopes.computeIfAbsent(element, k -> new TreeMap<>());
                 isotopes.put(rawLifeTime, isotope);//todo dont add stable ones
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index ecebc6afcd..b8ce40b180 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -141,9 +141,12 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         that.setTagCompound(new NBTTagCompound());
         list.add(that);
         for(IEMDefinition definition: TecTech.definitionsRegistry.getStacksRegisteredForDisplay()){
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.itemMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM))));
-            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1000+" "+translateToLocal("tt.keyword.mbMols")),new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.mbMols")),
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_MATERIAL_AMOUNT))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1+" "+translateToLocal("tt.keyword.itemMols")),
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_ITEM))));
+            list.add(setContent(new ItemStack(this).setStackDisplayName(definition.getLocalizedName()+" "+1000+" "+translateToLocal("tt.keyword.mbMols")),
+                    new EMInstanceStackMap(new EMInstanceStack(definition, EM_COUNT_PER_1k))));
         }
     }
 
diff --git a/src/main/resources/META-INF/tectech_at.cfg b/src/main/resources/META-INF/tectech_at.cfg
index e09e575a7d..fa76d13c1f 100644
--- a/src/main/resources/META-INF/tectech_at.cfg
+++ b/src/main/resources/META-INF/tectech_at.cfg
@@ -1,2 +1,17 @@
 public net.minecraft.block.Block field_149781_w #blockResistance
-public net.minecraft.block.Block field_149782_v #blockHardness
\ No newline at end of file
+public net.minecraft.block.Block field_149782_v #blockHardness
+protected net.minecraft.client.gui.FontRenderer field_111274_c #unicodePageLocations
+protected net.minecraft.client.gui.FontRenderer field_78285_g #colorCode
+protected net.minecraft.client.gui.FontRenderer field_78298_i #renderEngine
+protected net.minecraft.client.gui.FontRenderer field_78293_l #unicodeFlag
+protected net.minecraft.client.gui.FontRenderer field_78294_m #bidiFlag
+protected net.minecraft.client.gui.FontRenderer field_78291_n #red
+protected net.minecraft.client.gui.FontRenderer field_78292_o #blue
+protected net.minecraft.client.gui.FontRenderer field_78306_p #green
+protected net.minecraft.client.gui.FontRenderer field_78305_q #alpha
+protected net.minecraft.client.gui.FontRenderer field_78304_r #textColor
+protected net.minecraft.client.gui.FontRenderer field_78303_s #randomStyle
+protected net.minecraft.client.gui.FontRenderer field_78302_t #boldStyle
+protected net.minecraft.client.gui.FontRenderer field_78301_u #italicStyle
+protected net.minecraft.client.gui.FontRenderer field_78300_v #underlineStyle
+protected net.minecraft.client.gui.FontRenderer field_78299_w #strikethroughStyle
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 3142d87d16..79c46b07a2 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -948,8 +948,266 @@ tt.keyword.Chaos=Chaos
 tt.keyword.Primal=Primal
 tt.keyword.Aspect=Aspect
 
-
-
-
-
-
+tt.element.Neutronium=Neutronium
+tt.element.Hydrogen=Hydrogen
+tt.element.Helium=Helium
+tt.element.Lithium=Lithium
+tt.element.Beryllium=Beryllium
+tt.element.Boron=Boron
+tt.element.Carbon=Carbon
+tt.element.Nitrogen=Nitrogen
+tt.element.Oxygen=Oxygen
+tt.element.Fluorine=Fluorine
+tt.element.Neon=Neon
+tt.element.Sodium=Sodium
+tt.element.Magnesium=Magnesium
+tt.element.Aluminium=Aluminium
+tt.element.Silicon=Silicon
+tt.element.Phosphorus=Phosphorus
+tt.element.Sulfur=Sulfur
+tt.element.Chlorine=Chlorine
+tt.element.Argon=Argon
+tt.element.Potassium=Potassium
+tt.element.Calcium=Calcium
+tt.element.Scandium=Scandium
+tt.element.Titanium=Titanium
+tt.element.Vanadium=Vanadium
+tt.element.Chromium=Chromium
+tt.element.Manganese=Manganese
+tt.element.Iron=Iron
+tt.element.Cobalt=Cobalt
+tt.element.Nickel=Nickel
+tt.element.Copper=Copper
+tt.element.Zinc=Zinc
+tt.element.Gallium=Gallium
+tt.element.Germanium=Germanium
+tt.element.Arsenic=Arsenic
+tt.element.Selenium=Selenium
+tt.element.Bromine=Bromine
+tt.element.Krypton=Krypton
+tt.element.Rubidium=Rubidium
+tt.element.Strontium=Strontium
+tt.element.Yttrium=Yttrium
+tt.element.Zirconium=Zirconium
+tt.element.Niobium=Niobium
+tt.element.Molybdenum=Molybdenum
+tt.element.Technetium=Technetium
+tt.element.Ruthenium=Ruthenium
+tt.element.Rhodium=Rhodium
+tt.element.Palladium=Palladium
+tt.element.Silver=Silver
+tt.element.Cadmium=Cadmium
+tt.element.Indium=Indium
+tt.element.Tin=Tin
+tt.element.Antimony=Antimony
+tt.element.Tellurium=Tellurium
+tt.element.Iodine=Iodine
+tt.element.Xenon=Xenon
+tt.element.Caesium=Caesium
+tt.element.Barium=Barium
+tt.element.Lanthanum=Lanthanum
+tt.element.Cerium=Cerium
+tt.element.Praseodymium=Praseodymium
+tt.element.Neodymium=Neodymium
+tt.element.Promethium=Promethium
+tt.element.Samarium=Samarium
+tt.element.Europium=Europium
+tt.element.Gadolinium=Gadolinium
+tt.element.Terbium=Terbium
+tt.element.Dysprosium=Dysprosium
+tt.element.Holmium=Holmium
+tt.element.Erbium=Erbium
+tt.element.Thulium=Thulium
+tt.element.Ytterbium=Ytterbium
+tt.element.Lutetium=Lutetium
+tt.element.Hafnium=Hafnium
+tt.element.Tantalum=Tantalum
+tt.element.Tungsten=Tungsten
+tt.element.Rhenium=Rhenium
+tt.element.Osmium=Osmium
+tt.element.Iridium=Iridium
+tt.element.Platinum=Platinum
+tt.element.Gold=Gold
+tt.element.Mercury=Mercury
+tt.element.Thallium=Thallium
+tt.element.Lead=Lead
+tt.element.Bismuth=Bismuth
+tt.element.Polonium=Polonium
+tt.element.Astatine=Astatine
+tt.element.Radon=Radon
+tt.element.Francium=Francium
+tt.element.Radium=Radium
+tt.element.Actinium=Actinium
+tt.element.Thorium=Thorium
+tt.element.Protactinium=Protactinium
+tt.element.Uranium=Uranium
+tt.element.Neptunium=Neptunium
+tt.element.Plutonium=Plutonium
+tt.element.Americium=Americium
+tt.element.Curium=Curium
+tt.element.Berkelium=Berkelium
+tt.element.Californium=Californium
+tt.element.Einsteinium=Einsteinium
+tt.element.Fermium=Fermium
+tt.element.Mendelevium=Mendelevium
+tt.element.Nobelium=Nobelium
+tt.element.Lawrencium=Lawrencium
+tt.element.Rutherfordium=Rutherfordium
+tt.element.Dubnium=Dubnium
+tt.element.Seaborgium=Seaborgium
+tt.element.Bohrium=Bohrium
+tt.element.Hassium=Hassium
+tt.element.Meitnerium=Meitnerium
+tt.element.Darmstadtium=Darmstadtium
+tt.element.Roentgenium=Roentgenium
+tt.element.Copernicium=Copernicium
+tt.element.Nihonium=Nihonium
+tt.element.Flerovium=Flerovium
+tt.element.Moscovium=Moscovium
+tt.element.Livermorium=Livermorium
+tt.element.Tennessine=Tennessine
+tt.element.Oganesson=Oganesson
+
+tt.element.AntiNeutronium=Antineutronium
+tt.element.AntiHydrogen=Antihydrogen
+tt.element.AntiHelium=Antihelium
+tt.element.AntiLithium=Antilithium
+tt.element.AntiBeryllium=Antiberyllium
+tt.element.AntiBoron=Antiboron
+tt.element.AntiCarbon=Anticarbon
+tt.element.AntiNitrogen=Antinitrogen
+tt.element.AntiOxygen=Antioxygen
+tt.element.AntiFluorine=Antifluorine
+tt.element.AntiNeon=Antineon
+tt.element.AntiSodium=Antisodium
+tt.element.AntiMagnesium=Antimagnesium
+tt.element.AntiAluminium=Antialuminium
+tt.element.AntiSilicon=Antisilicon
+tt.element.AntiPhosphorus=Antiphosphorus
+tt.element.AntiSulfur=Antisulfur
+tt.element.AntiChlorine=Antichlorine
+tt.element.AntiArgon=Antiargon
+tt.element.AntiPotassium=Antipotassium
+tt.element.AntiCalcium=Anticalcium
+tt.element.AntiScandium=Antiscandium
+tt.element.AntiTitanium=Antititanium
+tt.element.AntiVanadium=Antivanadium
+tt.element.AntiChromium=Antichromium
+tt.element.AntiManganese=Antimanganese
+tt.element.AntiIron=Antiiron
+tt.element.AntiCobalt=Anticobalt
+tt.element.AntiNickel=Antinickel
+tt.element.AntiCopper=Anticopper
+tt.element.AntiZinc=Antizinc
+tt.element.AntiGallium=Antigallium
+tt.element.AntiGermanium=Antigermanium
+tt.element.AntiArsenic=Antiarsenic
+tt.element.AntiSelenium=Antiselenium
+tt.element.AntiBromine=Antibromine
+tt.element.AntiKrypton=Antikrypton
+tt.element.AntiRubidium=Antirubidium
+tt.element.AntiStrontium=Antistrontium
+tt.element.AntiYttrium=Antiyttrium
+tt.element.AntiZirconium=Antizirconium
+tt.element.AntiNiobium=Antiniobium
+tt.element.AntiMolybdenum=Antimolybdenum
+tt.element.AntiTechnetium=Antitechnetium
+tt.element.AntiRuthenium=Antiruthenium
+tt.element.AntiRhodium=Antirhodium
+tt.element.AntiPalladium=Antipalladium
+tt.element.AntiSilver=Antisilver
+tt.element.AntiCadmium=Anticadmium
+tt.element.AntiIndium=Antiindium
+tt.element.AntiTin=Antitin
+tt.element.AntiAntimony=Antiantimony
+tt.element.AntiTellurium=Antitellurium
+tt.element.AntiIodine=Antiiodine
+tt.element.AntiXenon=Antixenon
+tt.element.AntiCaesium=Anticaesium
+tt.element.AntiBarium=Antibarium
+tt.element.AntiLanthanum=Antilanthanum
+tt.element.AntiCerium=Anticerium
+tt.element.AntiPraseodymium=Antipraseodymium
+tt.element.AntiNeodymium=Antineodymium
+tt.element.AntiPromethium=Antipromethium
+tt.element.AntiSamarium=Antisamarium
+tt.element.AntiEuropium=Antieuropium
+tt.element.AntiGadolinium=Antigadolinium
+tt.element.AntiTerbium=Antiterbium
+tt.element.AntiDysprosium=Antidysprosium
+tt.element.AntiHolmium=Antiholmium
+tt.element.AntiErbium=Antierbium
+tt.element.AntiThulium=Antithulium
+tt.element.AntiYtterbium=Antiytterbium
+tt.element.AntiLutetium=Antilutetium
+tt.element.AntiHafnium=Antihafnium
+tt.element.AntiTantalum=Antitantalum
+tt.element.AntiTungsten=Antitungsten
+tt.element.AntiRhenium=Antirhenium
+tt.element.AntiOsmium=Antiosmium
+tt.element.AntiIridium=Antiiridium
+tt.element.AntiPlatinum=Antiplatinum
+tt.element.AntiGold=Antigold
+tt.element.AntiMercury=Antimercury
+tt.element.AntiThallium=Antithallium
+tt.element.AntiLead=Antilead
+tt.element.AntiBismuth=Antibismuth
+tt.element.AntiPolonium=Antipolonium
+tt.element.AntiAstatine=Antiastatine
+tt.element.AntiRadon=Antiradon
+tt.element.AntiFrancium=Antifrancium
+tt.element.AntiRadium=Antiradium
+tt.element.AntiActinium=Antiactinium
+tt.element.AntiThorium=Antithorium
+tt.element.AntiProtactinium=Antiprotactinium
+tt.element.AntiUranium=Antiuranium
+tt.element.AntiNeptunium=Antineptunium
+tt.element.AntiPlutonium=Antiplutonium
+tt.element.AntiAmericium=Antiamericium
+tt.element.AntiCurium=Anticurium
+tt.element.AntiBerkelium=Antiberkelium
+tt.element.AntiCalifornium=Antibalifornium
+tt.element.AntiEinsteinium=Antieinsteinium
+tt.element.AntiFermium=Antifermium
+tt.element.AntiMendelevium=Antimendelevium
+tt.element.AntiNobelium=Antinobelium
+tt.element.AntiLawrencium=Antilawrencium
+tt.element.AntiRutherfordium=Antirutherfordium
+tt.element.AntiDubnium=Antidubnium
+tt.element.AntiSeaborgium=Antiseaborgium
+tt.element.AntiBohrium=Antibohrium
+tt.element.AntiHassium=Antihassium
+tt.element.AntiMeitnerium=Antimeitnerium
+tt.element.AntiDarmstadtium=Antidarmstadtium
+tt.element.AntiRoentgenium=Antiroentgenium
+tt.element.AntiCopernicium=Anticopernicium
+tt.element.AntiNihonium=Antinihonium
+tt.element.AntiFlerovium=Antiflerovium
+tt.element.AntiMoscovium=Antimoscovium
+tt.element.AntiLivermorium=Antilivermorium
+tt.element.AntiTennessine=Antitennessine
+tt.element.AntiOganesson=Antioganesson
+
+tt.IUPAC.n=nil
+tt.IUPAC.u=un
+tt.IUPAC.b=bi
+tt.IUPAC.t=tri
+tt.IUPAC.q=quad
+tt.IUPAC.p=pent
+tt.IUPAC.h=hex
+tt.IUPAC.s=sept
+tt.IUPAC.o=oct
+tt.IUPAC.e=enn
+tt.IUPAC.N=Nil
+tt.IUPAC.U=Un
+tt.IUPAC.B=Bi
+tt.IUPAC.T=Tri
+tt.IUPAC.Q=Quad
+tt.IUPAC.P=Pent
+tt.IUPAC.H=Hex
+tt.IUPAC.S=Sept
+tt.IUPAC.O=Oct
+tt.IUPAC.E=Enn
+tt.IUPAC.ium=ium
+tt.IUPAC.Anti=Anti
+tt.keyword.Weird=*
\ No newline at end of file
-- 
cgit 


From 5caa75d6f753d876dee72daf20a462c90b4e03f0 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 27 Jan 2022 22:09:30 +0100
Subject: Cleanup Atoms Localization, and FontRenderer

(cherry picked from commit ac8311109c91731598466dbd9068f8c995b1d760)
---
 .../elementalMatter/definitions/complex/EMAtomDefinition.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 49fd8b5b54..03aae39578 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -357,7 +357,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 }
                 s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element + 10]));
             }
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return translateToLocal("tt.element."+(anti?"Anti":"")+NAME[element])+(weird?translateToLocal("tt.keyword.Weird"):"");
@@ -380,7 +382,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 element = element / 10;
             }
             s.append(SYMBOL_IUPAC[element + 10]);
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return (anti?"~":"")+SYMBOL[element]+(weird?translateToLocal("tt.keyword.Weird"):"");
-- 
cgit 


From 95614e658c1e5e00b002fd9f4e33fce49f1394fd Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 27 Jan 2022 22:09:30 +0100
Subject: Cleanup Atoms Localization, and FontRenderer

---
 .../definitions/EMComplexAspectDefinition.java     | 12 +++++++----
 .../definitions/EMPrimalAspectDefinition.java      | 25 +++++++++++-----------
 .../core/definitions/EMPrimitiveTemplate.java      |  6 ++++++
 .../core/definitions/IEMDefinition.java            | 10 +++++++--
 .../definitions/complex/EMAtomDefinition.java      | 25 +++++++++++++++-------
 .../definitions/complex/EMHadronDefinition.java    | 10 ++++-----
 .../definitions/primitive/EMBosonDefinition.java   |  4 ++--
 .../definitions/primitive/EMFermionDefinition.java |  4 ++--
 .../primitive/EMGaugeBosonDefinition.java          |  4 ++--
 .../definitions/primitive/EMLeptonDefinition.java  |  2 +-
 .../primitive/EMNeutrinoDefinition.java            |  4 ++--
 .../primitive/EMPrimitiveDefinition.java           |  4 ++--
 .../definitions/primitive/EMQuarkDefinition.java   |  4 ++--
 .../primitive/EMScalarBosonDefinition.java         |  4 ++--
 14 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index 40419604e4..8c90dc939c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -72,14 +72,18 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Aspect");
+    }
+
+    @Override
+    public String getShortLocalizedName() {
         String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
         if (name != null) {
-            name = name.substring(0, 1).toUpperCase() + name.substring(1);
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
         } else {
-            name = getSymbol();
+            return getSymbol();
         }
-        return translateToLocal("tt.keyword.Aspect") + ": " + name;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
index 885a71ef28..6fa709ef3e 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -13,12 +13,12 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     public static final EMPrimalAspectDefinition
-            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 45,"a`"),
-            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 44,"e`"),
-            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 43,"f`"),
-            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 42,"w`"),
-            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 40,"o`"),
-            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Chaos"), "c`", 1e5D, 41,"c`");
+            magic_air = new EMPrimalAspectDefinition("tt.keyword.Air", "a`", 1e1D, 45,"a`"),
+            magic_earth = new EMPrimalAspectDefinition("tt.keyword.Earth", "e`", 1e9D, 44,"e`"),
+            magic_fire = new EMPrimalAspectDefinition("tt.keyword.Fire", "f`", 1e3D, 43,"f`"),
+            magic_water = new EMPrimalAspectDefinition("tt.keyword.Water", "w`", 1e7D, 42,"w`"),
+            magic_order = new EMPrimalAspectDefinition("tt.keyword.Order", "o`", 1e5D, 40,"o`"),
+            magic_entropy = new EMPrimalAspectDefinition("tt.keyword.Chaos", "c`", 1e5D, 41,"c`");
 
     private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID,String bind) {
         super(name, symbol, 0, mass, 0, -1, ID,bind);
@@ -35,13 +35,14 @@ public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
+    public String getShortLocalizedName() {
         String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
-        if (name != null) {
-            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName()+" ("+name+")";
-        } else {
-            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName();
-        }
+        return name != null ? super.getShortLocalizedName() + " (" + name + ")" : super.getShortLocalizedName();
+    }
+
+    @Override
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Primal");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index 0f25d73704..a1f606c3c2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.Util.areBitsSet;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -72,6 +73,11 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         return getSymbol();
     }
 
+    @Override
+    public String getShortLocalizedName() {
+        return translateToLocal(getUnlocalizedName());
+    }
+
     @Override
     public IEMDefinition getAnti() {
         return anti;//no need for copy
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
index 8125812dc6..aae5a8caca 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
@@ -19,12 +19,18 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
     //add text based creators for recipe formula input?
 
     //Nomenclature
-    String getLocalizedName();
+    String getLocalizedTypeName();
 
-    String getSymbol();
+    String getShortLocalizedName();
+
+    default String getLocalizedName(){
+        return getLocalizedTypeName()+": "+getShortLocalizedName();
+    }
 
     String getShortSymbol();
 
+    String getSymbol();
+
     void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
 
     void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 49fd8b5b54..0eced7bd3c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -338,9 +338,14 @@ public class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        int     element  = abs(this.getElement());
-        boolean anti = this.getElement() < 0;
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Element");
+    }
+
+    @Override
+    public String getShortLocalizedName() {
+        int     element  = abs(getElement());
+        boolean anti = getElement() < 0;
         boolean weird = abs(getGeneration()) != 1;
         if(element>=NAME.length){
             StringBuilder s = new StringBuilder();
@@ -357,7 +362,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 }
                 s.append(translateToLocal("tt.IUPAC."+SYMBOL_IUPAC[element + 10]));
             }
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return translateToLocal("tt.element."+(anti?"Anti":"")+NAME[element])+(weird?translateToLocal("tt.keyword.Weird"):"");
@@ -365,13 +372,13 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public String getSymbol() {
-        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
+        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + getElement()) + " C:" + getCharge();
     }
 
     @Override
     public String getShortSymbol() {
-        int     element  = abs(this.getElement());
-        boolean anti = this.getElement() < 0;
+        int     element  = abs(getElement());
+        boolean anti = getElement() < 0;
         boolean weird = abs(getGeneration()) != 1;
         if(element>=SYMBOL.length){
             StringBuilder s = new StringBuilder(anti?"~":"");
@@ -380,7 +387,9 @@ public class EMAtomDefinition extends EMComplexTemplate {
                 element = element / 10;
             }
             s.append(SYMBOL_IUPAC[element + 10]);
-            s.append(weird?translateToLocal("tt.keyword.Weird"):"");
+            if(weird){
+                s.append(translateToLocal("tt.keyword.Weird"));
+            }
             return s.toString();
         }
         return (anti?"~":"")+SYMBOL[element]+(weird?translateToLocal("tt.keyword.Weird"):"");
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index aedb11ac05..19208fbf4a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -137,9 +137,8 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
     }
 
     @Override
-    public String getLocalizedName() {
-        StringBuilder name = new StringBuilder(getSimpleName());
-        name.append(':');
+    public String getShortLocalizedName() {
+        StringBuilder name = new StringBuilder();
         String sym = translateToLocal(UNLOCALIZED_NAME_MAP.get(this));
         if (sym != null) {
             name.append(' ').append(sym);
@@ -151,7 +150,8 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
         return name.toString();
     }
 
-    private String getSimpleName() {
+    @Override
+    public String getLocalizedTypeName() {
         switch (getAmount()) {
             case 2:
                 return translateToLocal("tt.keyword.Meson");
@@ -472,7 +472,7 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
             lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
         if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = " + getSimpleName());
+            lines.add("NAME = " + getLocalizedTypeName());
             //lines.add("SYMBOL = "+getSymbol());
         }
         if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index 9b77a6cab8..affebf91a2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -10,7 +10,7 @@ public abstract class EMBosonDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Boson")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Boson");
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
index f8f05b80ee..4c0e1d28bc 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
@@ -10,7 +10,7 @@ public abstract class EMFermionDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Fermion")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Fermion");
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
index fb8128c3a5..cf59c1fffd 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
@@ -72,8 +72,8 @@ public class EMGaugeBosonDefinition extends EMBosonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.GaugeBoson") + ": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.GaugeBoson");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index c665bf23b4..324d790de6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -63,7 +63,7 @@ public class EMLeptonDefinition extends EMFermionDefinition {
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Lepton")+": " + translateToLocal(getUnlocalizedName());
+        return translateToLocal("tt.keyword.Lepton")+": " + getShortLocalizedName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index 9ef04e8c7e..9bb05d2cbf 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -52,8 +52,8 @@ public class EMNeutrinoDefinition extends EMLeptonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Neutrino")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Neutrino");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index 60f87ac83b..785d426a0b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -47,8 +47,8 @@ public class EMPrimitiveDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Primitive") + ": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Primitive");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index 19162bf90d..a93b16ca0d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -99,8 +99,8 @@ public class EMQuarkDefinition extends EMFermionDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Quark")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Quark");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
index 5070954847..760ce48068 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
@@ -35,8 +35,8 @@ public class EMScalarBosonDefinition extends EMBosonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.ScalarBoson")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.ScalarBoson");
     }
 
     @Override
-- 
cgit 


From 32c91825fa6c15ca55591d08bece00c6dd9d2077 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Thu, 27 Jan 2022 22:09:30 +0100
Subject: Cleanup Atoms Localization, and FontRenderer

(cherry picked from commit 95614e658c1e5e00b002fd9f4e33fce49f1394fd)
---
 .../definitions/EMComplexAspectDefinition.java     | 12 +++++++----
 .../definitions/EMPrimalAspectDefinition.java      | 25 +++++++++++-----------
 .../core/definitions/EMPrimitiveTemplate.java      |  6 ++++++
 .../core/definitions/IEMDefinition.java            | 10 +++++++--
 .../definitions/complex/EMAtomDefinition.java      | 17 +++++++++------
 .../definitions/complex/EMHadronDefinition.java    | 10 ++++-----
 .../definitions/primitive/EMBosonDefinition.java   |  4 ++--
 .../definitions/primitive/EMFermionDefinition.java |  4 ++--
 .../primitive/EMGaugeBosonDefinition.java          |  4 ++--
 .../definitions/primitive/EMLeptonDefinition.java  |  2 +-
 .../primitive/EMNeutrinoDefinition.java            |  4 ++--
 .../primitive/EMPrimitiveDefinition.java           |  4 ++--
 .../definitions/primitive/EMQuarkDefinition.java   |  4 ++--
 .../primitive/EMScalarBosonDefinition.java         |  4 ++--
 14 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index 40419604e4..8c90dc939c 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -72,14 +72,18 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Aspect");
+    }
+
+    @Override
+    public String getShortLocalizedName() {
         String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
         if (name != null) {
-            name = name.substring(0, 1).toUpperCase() + name.substring(1);
+            return name.substring(0, 1).toUpperCase() + name.substring(1);
         } else {
-            name = getSymbol();
+            return getSymbol();
         }
-        return translateToLocal("tt.keyword.Aspect") + ": " + name;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
index 885a71ef28..6fa709ef3e 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMPrimalAspectDefinition.java
@@ -13,12 +13,12 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     public static final EMPrimalAspectDefinition
-            magic_air = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Air"), "a`", 1e1D, 45,"a`"),
-            magic_earth = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Earth"), "e`", 1e9D, 44,"e`"),
-            magic_fire = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Fire"), "f`", 1e3D, 43,"f`"),
-            magic_water = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Water"), "w`", 1e7D, 42,"w`"),
-            magic_order = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Order"), "o`", 1e5D, 40,"o`"),
-            magic_entropy = new EMPrimalAspectDefinition(translateToLocal("tt.keyword.Chaos"), "c`", 1e5D, 41,"c`");
+            magic_air = new EMPrimalAspectDefinition("tt.keyword.Air", "a`", 1e1D, 45,"a`"),
+            magic_earth = new EMPrimalAspectDefinition("tt.keyword.Earth", "e`", 1e9D, 44,"e`"),
+            magic_fire = new EMPrimalAspectDefinition("tt.keyword.Fire", "f`", 1e3D, 43,"f`"),
+            magic_water = new EMPrimalAspectDefinition("tt.keyword.Water", "w`", 1e7D, 42,"w`"),
+            magic_order = new EMPrimalAspectDefinition("tt.keyword.Order", "o`", 1e5D, 40,"o`"),
+            magic_entropy = new EMPrimalAspectDefinition("tt.keyword.Chaos", "c`", 1e5D, 41,"c`");
 
     private EMPrimalAspectDefinition(String name, String symbol, double mass, int ID,String bind) {
         super(name, symbol, 0, mass, 0, -1, ID,bind);
@@ -35,13 +35,14 @@ public final class EMPrimalAspectDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
+    public String getShortLocalizedName() {
         String name = AspectDefinitionCompat.aspectDefinitionCompat.getAspectLocalizedName(this);
-        if (name != null) {
-            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName()+" ("+name+")";
-        } else {
-            return translateToLocal("tt.keyword.Primal") + ": " + getUnlocalizedName();
-        }
+        return name != null ? super.getShortLocalizedName() + " (" + name + ")" : super.getShortLocalizedName();
+    }
+
+    @Override
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Primal");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index 0f25d73704..a1f606c3c2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
 import static com.github.technus.tectech.util.Util.areBitsSet;
+import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
  * Created by danie_000 on 22.10.2016.
@@ -72,6 +73,11 @@ public abstract class EMPrimitiveTemplate extends EMComplexTemplate {
         return getSymbol();
     }
 
+    @Override
+    public String getShortLocalizedName() {
+        return translateToLocal(getUnlocalizedName());
+    }
+
     @Override
     public IEMDefinition getAnti() {
         return anti;//no need for copy
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
index 8125812dc6..aae5a8caca 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/IEMDefinition.java
@@ -19,12 +19,18 @@ public interface IEMDefinition extends Comparable<IEMDefinition>,Cloneable {//IM
     //add text based creators for recipe formula input?
 
     //Nomenclature
-    String getLocalizedName();
+    String getLocalizedTypeName();
 
-    String getSymbol();
+    String getShortLocalizedName();
+
+    default String getLocalizedName(){
+        return getLocalizedTypeName()+": "+getShortLocalizedName();
+    }
 
     String getShortSymbol();
 
+    String getSymbol();
+
     void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel);
 
     void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 03aae39578..0eced7bd3c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -338,9 +338,14 @@ public class EMAtomDefinition extends EMComplexTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        int     element  = abs(this.getElement());
-        boolean anti = this.getElement() < 0;
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Element");
+    }
+
+    @Override
+    public String getShortLocalizedName() {
+        int     element  = abs(getElement());
+        boolean anti = getElement() < 0;
         boolean weird = abs(getGeneration()) != 1;
         if(element>=NAME.length){
             StringBuilder s = new StringBuilder();
@@ -367,13 +372,13 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public String getSymbol() {
-        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + element) + " C:" + getCharge();
+        return getShortSymbol() + " N:" + getNeutralCount() + " I:" + (getNeutralCount() + getElement()) + " C:" + getCharge();
     }
 
     @Override
     public String getShortSymbol() {
-        int     element  = abs(this.getElement());
-        boolean anti = this.getElement() < 0;
+        int     element  = abs(getElement());
+        boolean anti = getElement() < 0;
         boolean weird = abs(getGeneration()) != 1;
         if(element>=SYMBOL.length){
             StringBuilder s = new StringBuilder(anti?"~":"");
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index aedb11ac05..19208fbf4a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -137,9 +137,8 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
     }
 
     @Override
-    public String getLocalizedName() {
-        StringBuilder name = new StringBuilder(getSimpleName());
-        name.append(':');
+    public String getShortLocalizedName() {
+        StringBuilder name = new StringBuilder();
         String sym = translateToLocal(UNLOCALIZED_NAME_MAP.get(this));
         if (sym != null) {
             name.append(' ').append(sym);
@@ -151,7 +150,8 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
         return name.toString();
     }
 
-    private String getSimpleName() {
+    @Override
+    public String getLocalizedTypeName() {
         switch (getAmount()) {
             case 2:
                 return translateToLocal("tt.keyword.Meson");
@@ -472,7 +472,7 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
             lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
         if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
-            lines.add("NAME = " + getSimpleName());
+            lines.add("NAME = " + getLocalizedTypeName());
             //lines.add("SYMBOL = "+getSymbol());
         }
         if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
index 9b77a6cab8..affebf91a2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMBosonDefinition.java
@@ -10,7 +10,7 @@ public abstract class EMBosonDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Boson")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Boson");
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
index f8f05b80ee..4c0e1d28bc 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMFermionDefinition.java
@@ -10,7 +10,7 @@ public abstract class EMFermionDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Fermion")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Fermion");
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
index fb8128c3a5..cf59c1fffd 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMGaugeBosonDefinition.java
@@ -72,8 +72,8 @@ public class EMGaugeBosonDefinition extends EMBosonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.GaugeBoson") + ": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.GaugeBoson");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
index c665bf23b4..324d790de6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMLeptonDefinition.java
@@ -63,7 +63,7 @@ public class EMLeptonDefinition extends EMFermionDefinition {
 
     @Override
     public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Lepton")+": " + translateToLocal(getUnlocalizedName());
+        return translateToLocal("tt.keyword.Lepton")+": " + getShortLocalizedName();
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
index 9ef04e8c7e..9bb05d2cbf 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMNeutrinoDefinition.java
@@ -52,8 +52,8 @@ public class EMNeutrinoDefinition extends EMLeptonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Neutrino")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Neutrino");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
index 60f87ac83b..785d426a0b 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMPrimitiveDefinition.java
@@ -47,8 +47,8 @@ public class EMPrimitiveDefinition extends EMPrimitiveTemplate {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Primitive") + ": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Primitive");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
index 19162bf90d..a93b16ca0d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMQuarkDefinition.java
@@ -99,8 +99,8 @@ public class EMQuarkDefinition extends EMFermionDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.Quark")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.Quark");
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
index 5070954847..760ce48068 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/primitive/EMScalarBosonDefinition.java
@@ -35,8 +35,8 @@ public class EMScalarBosonDefinition extends EMBosonDefinition {
     }
 
     @Override
-    public String getLocalizedName() {
-        return translateToLocal("tt.keyword.ScalarBoson")+": " + translateToLocal(getUnlocalizedName());
+    public String getLocalizedTypeName() {
+        return translateToLocal("tt.keyword.ScalarBoson");
     }
 
     @Override
-- 
cgit 


From f45f36a47d911383b2604e14dcc4638076b0329f Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 30 Jan 2022 19:44:59 +0100
Subject: Merge branch 'GTNH/Upstream'

# Conflicts:
#	build.gradle.kts
---
 .gitignore                                         |   61 +-
 .gitmodules                                        |    3 -
 build.gradle                                       |  605 +++++++++
 build.gradle.kts                                   |  290 ----
 dependencies.gradle                                |   27 +
 .../OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar |  Bin 0 -> 988221 bytes
 draw_io_graph.png                                  |  Bin 0 -> 113460 bytes
 gradle.properties                                  |   68 +-
 gradle/wrapper/gradle-wrapper.jar                  |  Bin 54417 -> 55616 bytes
 gradle/wrapper/gradle-wrapper.properties           |    2 +-
 gradlew                                            |   22 +-
 gradlew.bat                                        |   18 +-
 libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar            |  Bin 1213993 -> 0 bytes
 libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar      |  Bin 4458558 -> 0 bytes
 .../OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar |  Bin 988221 -> 0 bytes
 real.gradle.properties                             |   18 -
 repositories.gradle                                |   30 +
 .../java/com/github/technus/tectech/TecTech.java   |    2 +-
 .../dreamcraft/DreamCraftRecipeLoader.java         |  255 +++-
 .../tectech/compatibility/gtpp/GtppAtomLoader.java |    6 +-
 .../thing/metaTileEntity/multi/EssentiaCompat.java |    4 +-
 .../multi/EssentiaCompatEnabled.java               |    7 +-
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java  |   76 +-
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java    |   60 +-
 .../technus/tectech/entity/fx/BlockHint.java       |  133 --
 .../tectech/loader/ConstructableLoader.java        |   57 -
 .../github/technus/tectech/loader/MainLoader.java  |    6 +-
 .../technus/tectech/loader/NetworkDispatcher.java  |    6 +-
 .../tectech/loader/recipe/BaseRecipeLoader.java    |   27 +-
 .../technus/tectech/loader/thing/ThingsLoader.java |    4 -
 .../mechanics/alignment/AlignmentLimits.java       |  183 ---
 .../mechanics/alignment/AlignmentMessage.java      |  140 --
 .../mechanics/alignment/AlignmentUtility.java      |   45 -
 .../tectech/mechanics/alignment/IAlignment.java    |  187 ---
 .../mechanics/alignment/IAlignmentLimits.java      |   19 -
 .../mechanics/alignment/IAlignmentProvider.java    |    5 -
 .../mechanics/alignment/IntegerAxisSwap.java       |   84 --
 .../mechanics/alignment/enumerable/Direction.java  |   34 -
 .../alignment/enumerable/ExtendedFacing.java       |  358 -----
 .../mechanics/alignment/enumerable/Flip.java       |   76 --
 .../mechanics/alignment/enumerable/Rotation.java   |   76 --
 .../constructable/ConstructableUtility.java        |  114 --
 .../mechanics/constructable/IConstructable.java    |   16 -
 .../constructable/IMultiblockInfoContainer.java    |   39 -
 .../mechanics/dataTransport/DataPacket.java        |    2 +-
 .../mechanics/dataTransport/QuantumDataPacket.java |    2 +-
 .../tectech/mechanics/spark/ThaumSpark.java        |    3 +-
 .../mechanics/structure/IBlockPosConsumer.java     |    7 -
 .../mechanics/structure/ICustomBlockSetting.java   |   17 -
 .../mechanics/structure/IStructureDefinition.java  |  167 ---
 .../mechanics/structure/IStructureElement.java     |   43 -
 .../structure/IStructureElementChain.java          |   41 -
 .../structure/IStructureElementCheckOnly.java      |   16 -
 .../structure/IStructureElementDeferred.java       |    7 -
 .../structure/IStructureElementNoPlacement.java    |   11 -
 .../mechanics/structure/IStructureNavigate.java    |   28 -
 .../tectech/mechanics/structure/Structure.java     |  262 ----
 .../mechanics/structure/StructureDefinition.java   |  288 ----
 .../mechanics/structure/StructureUtility.java      | 1395 --------------------
 .../mechanics/structure/adders/IBlockAdder.java    |   14 -
 .../mechanics/structure/adders/IHatchAdder.java    |   14 -
 .../mechanics/structure/adders/ITileAdder.java     |   12 -
 .../mechanics/tesla/ITeslaConnectableSimple.java   |    2 +-
 .../mechanics/tesla/TeslaCoverConnection.java      |    7 +-
 .../tectech/nei/TT_NEI_ResearchHandler.java        |   12 +-
 .../technus/tectech/nei/TT_NEI_ScannerHandler.java |   12 +-
 .../github/technus/tectech/proxy/ClientProxy.java  |   40 -
 .../technus/tectech/recipe/TT_recipeAdder.java     |   67 +-
 .../technus/tectech/thing/CustomItemList.java      |    2 +-
 .../tectech/thing/casing/GT_Block_HintTT.java      |  106 --
 .../tectech/thing/casing/TT_Container_Casings.java |    2 +-
 .../thing/cover/GT_Cover_TM_EnderFluidLink.java    |   10 +-
 .../thing/item/ConstructableTriggerItem.java       |   49 -
 .../thing/item/FrontRotationTriggerItem.java       |   48 -
 .../tectech/thing/item/PowerPassUpgradeCover.java  |   10 +-
 .../GT_MetaTileEntity_Hatch_DataConnector.java     |    5 +-
 .../GT_MetaTileEntity_Hatch_DynamoTunnel.java      |    3 +-
 .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java |    4 +-
 .../GT_MetaTileEntity_Hatch_EnergyTunnel.java      |    4 +-
 .../GT_MetaTileEntity_Hatch_OverflowElemental.java |   12 +-
 .../multi/GT_MetaTileEntity_EM_annihilation.java   |   71 +-
 .../multi/GT_MetaTileEntity_EM_bhg.java            |  183 +--
 .../multi/GT_MetaTileEntity_EM_computer.java       |   88 +-
 .../multi/GT_MetaTileEntity_EM_crafting.java       |   60 +-
 .../multi/GT_MetaTileEntity_EM_dataBank.java       |   46 +-
 .../multi/GT_MetaTileEntity_EM_decay.java          |   53 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |   46 +-
 .../multi/GT_MetaTileEntity_EM_infuser.java        |   46 +-
 .../multi/GT_MetaTileEntity_EM_junction.java       |   68 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   54 +-
 .../multi/GT_MetaTileEntity_EM_research.java       |  102 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        |   84 +-
 .../multi/GT_MetaTileEntity_EM_stabilizer.java     |   53 +-
 .../multi/GT_MetaTileEntity_EM_switch.java         |   50 +-
 .../multi/GT_MetaTileEntity_EM_transformer.java    |   14 +-
 .../multi/GT_MetaTileEntity_EM_wormhole.java       |   64 +-
 .../multi/GT_MetaTileEntity_TM_microwave.java      |   49 +-
 .../GT_MetaTileEntity_TM_proccessingStack.java     |   38 +-
 .../multi/GT_MetaTileEntity_TM_teslaCoil.java      |   93 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |   58 +-
 .../render/TT_RenderedExtendedFacingTexture.java   |    4 +-
 .../em_collider/GT_MetaTileEntity_EM_collider.java |   94 +-
 .../em_machine/GT_MetaTileEntity_EM_machine.java   |   48 +-
 .../single/GT_MetaTileEntity_DataReader.java       |    8 +-
 .../GT_MetaTileEntity_DebugStructureWriter.java    |   34 +-
 .../single/GT_MetaTileEntity_TeslaCoil.java        |    6 +-
 .../com/github/technus/tectech/util/Vec3Impl.java  |  146 --
 src/main/resources/assets/tectech/lang/en_US.lang  |    8 +-
 src/main/resources/assets/tectech/lang/zh_CN.lang  |   10 +-
 src/main/resources/mcmod.info                      |    8 +-
 110 files changed, 2012 insertions(+), 5561 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 build.gradle
 delete mode 100644 build.gradle.kts
 create mode 100644 dependencies.gradle
 create mode 100644 dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
 create mode 100644 draw_io_graph.png
 delete mode 100644 libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar
 delete mode 100644 libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar
 delete mode 100644 libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
 delete mode 100644 real.gradle.properties
 create mode 100644 repositories.gradle
 delete mode 100644 src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java
 delete mode 100644 src/main/java/com/github/technus/tectech/loader/ConstructableLoader.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentLimits.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentMessage.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentUtility.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignment.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentLimits.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentProvider.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/IntegerAxisSwap.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Direction.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/ExtendedFacing.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Flip.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Rotation.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/constructable/ConstructableUtility.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/constructable/IConstructable.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/constructable/IMultiblockInfoContainer.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IBlockPosConsumer.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/ICustomBlockSetting.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java
 delete mode 100644 src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
 delete mode 100644 src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
 delete mode 100644 src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
 delete mode 100644 src/main/java/com/github/technus/tectech/util/Vec3Impl.java

diff --git a/.gitignore b/.gitignore
index 3d66b81105..40fb5e4a7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,29 @@
-.gradle/
-run/
-.settings/
+.gradle
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
 .classpath
 .project
-bin/
-out/
-libs/gregtech*
-CREDITS-fml.txt
-LICENSE-fml.txt
-MinecraftForge-Credits.txt
-MinecraftForge-License.txt
-CoreMod.iml
-CoreMod.ipr
-CoreMod.iws
-Idea.bat
-SetupDevWorkspaces.bat
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
 *.iml
 *.ipr
 *.iws
+src/main/resources/mixins.*.json
 *.bat
-.idea/workspace.xml
-*.db
-*.log
-.idea/
-\.directory
-asm/
-config/
-saves/
-usernamecache.json
-PlayerCache.dat
-GregTech.cfg
-options.txt
-GregTech.lang
-mods/
-classes/
-logs/
-libs/AsieLib-1.7.10-0.4.9-deobf.jar
-libs/Computronics-1.7.10-1.6.6-deobf.jar
-libs/Galacticraft-API-1.7-3.0.12.504.jar
-libs/GTNewHorizonsCoreMod-1.7.10-1.6.10.jar
-libs/MicdoodleCore-1.7-3.0.12.504.jar
-libs/worldedit-forge-mc1.7.10-6.1.1-dist.jar
-eclipse/
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 58eebb4aa5..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "AVRcore"]
-	path = AVRcore
-	url = https://github.com/Technus/AVRcore
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..f15607a826
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,605 @@
+//version: 1642484596
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
+
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
+buildscript {
+    repositories {
+        maven {
+            name = "forge"
+            url = "https://maven.minecraftforge.net"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+        maven {
+            name = "Scala CI dependencies"
+            url = "https://repo1.maven.org/maven2/"
+        }
+        maven {
+            name = "jitpack"
+            url = "https://jitpack.io"
+        }
+    }
+    dependencies {
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.5'
+    }
+}
+
+plugins {
+    id 'idea'
+    id 'scala'
+    id("org.ajoberstar.grgit") version("3.1.1")
+    id("com.github.johnrengelman.shadow") version("4.0.4")
+    id("com.palantir.git-version") version("0.12.3")
+    id("maven-publish")
+}
+
+apply plugin: 'forge'
+
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
+}
+
+javadoc.options.encoding = 'UTF-8'
+tasks.withType(Javadoc) {
+    options.encoding = 'UTF-8'
+}
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+tasks.withType(Test) {
+    systemProperty("file.encoding", "UTF-8")
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+}
+
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(getFile(targetFile).exists() == false) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+if(coreModClass) {
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
+
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+'git config core.fileMode false'.execute()
+
+// Pulls version first from the VERSION env and then git tag
+String identifiedVersion
+try {
+    String versionOverride = System.getenv("VERSION") ?: null
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+    version = minecraftVersion + "-" + identifiedVersion
+}
+catch (Exception e) {
+    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag, or the VERSION override must be set!");
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
+
+minecraft {
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
+    runDir = "run"
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            replace gradleTokenVersion, versionDetails().lastTag
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
+}
+
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
+    implementation.extendsFrom(shadowCompile)
+    implementation.extendsFrom(shadeCompile)
+}
+
+repositories {
+    maven {
+        name = "Overmind forge repo mirror"
+        url = "https://gregtech.overminddl1.com/"
+    }
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
+    }
+}
+
+dependencies {
+    if(usesMixins.toBoolean()) {
+        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
+        annotationProcessor("com.google.guava:guava:24.1.1-jre")
+        annotationProcessor("com.google.code.gson:gson:2.8.6")
+        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile("com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH") {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: "launchwrapper"
+            exclude module: "guava"
+            exclude module: "gson"
+            exclude module: "commons-io"
+            exclude module: "log4j-core"
+        }
+        compile("com.github.GTNewHorizons:SpongeMixins:1.5.0")
+    }
+}
+
+apply from: 'dependencies.gradle'
+
+def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+
+task generateAssets {
+    if(usesMixins.toBoolean()) {
+        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
+}
+
+"""
+    }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+}
+
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
+
+afterEvaluate {
+    if(usesMixins.toBoolean()) {
+        tasks.compileJava {
+            options.compilerArgs += [
+                    "-AreobfSrgFile=${tasks.reobf.srg}",
+                    "-AoutSrgFile=${mixinSrg}",
+                    "-AoutRefMapFile=${refMap}",
+                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                    "-XDenableSunApiLintControl",
+                    "-XDignore.symbol.file"
+            ]
+        }
+    }
+}
+
+runClient {
+    def arguments = []
+
+    if(usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+}
+
+runServer {
+    def arguments = []
+
+    if (usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    args(arguments)
+}
+
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
+}
+
+processResources
+{
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+
+        // replace version and mcversion
+        expand "minecraftVersion": project.minecraft.version,
+                "modVersion": versionDetails().lastTag,
+                "modId": modId,
+                "modName": modName
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
+
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+}
+
+task shadowDevJar(type: ShadowJar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+}
+
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
+}
+
+task apiJar(type: Jar) {
+    from (sourceSets.main.allJava) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    if(!noPublishedSources) {
+        archives sourcesJar
+    }
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// publishing
+publishing {
+    publications {
+        maven(MavenPublication) {
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowJar : jar, classifier: ""
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "src"
+            }
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            // Using the identified version, not project.version as it has the prepended 1.7.10
+            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
+        }
+    }
+
+    repositories {
+        maven {
+            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
+            credentials {
+                username = System.getenv("MAVEN_USER") ?: "NONE"
+                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+            }
+        }
+    }
+}
+
+// Updating
+task updateBuildScript {
+    doLast {
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
+}
+
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("build.gradle")
+        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
+
+// Helper methods
+
+def checkPropertyExists(String propertyName) {
+    if (project.hasProperty(propertyName) == false) {
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
+}
diff --git a/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index bf388c9e64..0000000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,290 +0,0 @@
-import net.minecraftforge.gradle.user.UserExtension
-import java.io.FileInputStream
-import java.util.*
-import java.io.*
-
-buildscript {
-    repositories {
-        mavenCentral()
-        maven("http://files.minecraftforge.net/maven")
-        maven("https://jitpack.io")
-    }
-    dependencies {
-        classpath("com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT"){
-            isChanging = true
-        }
-    }
-}
-
-plugins {
-    idea
-    java
-    signing
-}
-
-apply(plugin = "forge")
-
-//Downloads Javadocs and sources by default
-idea {
-    module {
-        this.isDownloadJavadoc = true
-        this.isDownloadSources = true
-    }
-}
-
-//Set Java to version 1.8
-java {
-    this.sourceCompatibility = JavaVersion.VERSION_1_8
-    this.targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-//Set standard encoding
-tasks.withType<JavaCompile> {
-    options.encoding = "UTF-8"
-}
-
-//Add extra sources here
-sourceSets.getByName("main") {
-    java.srcDir("src/main/java")
-    java.srcDir("AVRcore/src")
-}
-
-//Load Minecraft Version
-val Project.minecraft: UserExtension
-    get() = extensions.getByName<UserExtension>("minecraft")
-
-//TODO Delete this! This exists to load the configs from the real properties file, which is needed for Jenkins to build
-//Gradle will load gradle.properties from it's home, it's install, and the project folder. Clearly whoever setup the
-//Jenkins jar signing needs to be reminded of this!
-val prop = Properties()
-prop.load(FileInputStream("real.gradle.properties"))
-val propSign = Properties()
-propSign.load(FileInputStream("gradle.properties"))
-
-//TODO Delete
-val projectVersion: String = prop.getProperty("projectVersion")
-//TODO Uncomment
-//val projectVersion: String by project
-
-//Generates a hash for each new commit to differentiate versions
-var commitHash = Runtime
-        .getRuntime()
-        .exec("git rev-parse --short HEAD")
-        .let { process ->
-            process.waitFor()
-            val output = process.inputStream.use {
-                it.bufferedReader().use(BufferedReader::readText)
-            }
-            process.destroy()
-            output.trim()
-        }
-
-minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
-version = "$projectVersion-$commitHash"
-group = "com.github.technus"
-
-//Minecraft Block
-configure<UserExtension> {
-    //Replaces version inside the mod
-    this.includes.addAll(
-            arrayOf(
-                    "Reference.java"
-            )
-    )
-    this.replacements.putAll(
-            mapOf(
-                    Pair("GRADLETOKEN_VERSION", project.version)
-            )
-    )
-
-    //This is sometimes called 'eclipse' instead
-    this.runDir = "run"
-}
-
-repositories {
-    mavenLocal()
-    maven("https://gregtech.overminddl1.com/") { this.name = "GT6Maven" }
-    maven("http://maven.ic2.player.to/") { this.name = "ic2" }
-    maven("http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/") { this.name = "UsrvDE/GTNH" }
-    ivy {
-        this.name = "gtnh_download_source_underscores"
-        this.artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]")
-    }
-    ivy {
-        this.name = "gtnh_download_source"
-        this.artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]")
-    }
-    ivy {
-        this.name = "BuildCraft"
-        this.artifactPattern("http://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision](-[classifier]).[ext]")
-    }
-    maven("http://maven.cil.li/") { this.name = "OpenComputers" }
-    maven("http://default.mobiusstrip.eu/maven") { this.name = "Jabba" }
-    maven("http://chickenbones.net/maven/") { this.name = "CodeChicken" }
-    maven("http://www.ryanliptak.com/maven/") { this.name = "appleCore" }
-    maven("https://jitpack.io")
-}
-
-dependencies {
-    //Local Libraries
-    compile(fileTree("libs") { this.include("*.jar") })
-
-    //TODO Uncomment
-    //Versions from properties
-    //val ic2Version: String by project
-    //val gt5uVersion: String by project
-    //val yamcoreVersion: String by project
-    //val opencomputersVersion: String by project
-    //val computercraftVersion: String by project
-    //val baublesVersion: String by project
-    //val thaumcraftVersion: String by project
-    //val codechickenlibVersion: String by project
-    //val codechickencoreVersion: String by project
-    //val neiVersion: String by project
-    //val wailaVersion: String by project
-    //val galacticraftVersion: String by project
-    //val galacticGregVersion: String by project
-    //val buildcraftVersion: String by project
-    //val forestryVersion: String by project
-    //val enderioVersion: String by project
-    //val enderCoreVersion: String by project
-
-    //TODO Delete
-    val ic2Version: String = prop.getProperty("ic2Version")
-    val gt5uVersion: String = prop.getProperty("gt5uVersion")
-    val yamcoreVersion: String = prop.getProperty("yamcoreVersion")
-    val opencomputersVersion: String = prop.getProperty("opencomputersVersion")
-    val computercraftVersion: String = prop.getProperty("computercraftVersion")
-    val baublesVersion: String = prop.getProperty("baublesVersion")
-    val thaumcraftVersion: String = prop.getProperty("thaumcraftVersion")
-    val codechickenlibVersion: String = prop.getProperty("codechickenlibVersion")
-    val codechickencoreVersion: String = prop.getProperty("codechickencoreVersion")
-    val neiVersion: String = prop.getProperty("neiVersion")
-    val wailaVersion: String = prop.getProperty("wailaVersion")
-    val galacticraftVersion: String = prop.getProperty("galacticraftVersion")
-    val galacticGregVersion: String = prop.getProperty("galacticGregVersion")
-    val buildcraftVersion: String = prop.getProperty("buildcraftVersion")
-    val forestryVersion: String = prop.getProperty("forestryVersion")
-    val enderioVersion: String = prop.getProperty("enderioVersion")
-    val enderCoreVersion: String = prop.getProperty("enderCoreVersion")
-
-    //Hard Dependencies
-    compile("net.industrial-craft:industrialcraft-2:$ic2Version:dev")
-    compile("com.github.GTNewHorizons:GT5-Unofficial:$gt5uVersion:dev"){
-        exclude("net.industrial-craft", "industrialcraft-2")
-        isChanging = true
-    }
-    compile("eu.usrv:YAMCore:$yamcoreVersion:deobf")
-
-    //Compile Dependencies
-    compileOnly("li.cil.oc:OpenComputers:$opencomputersVersion:dev")
-    compileOnly("dan200.computercraft:ComputerCraft:$computercraftVersion")
-    compile("com.azanor.baubles:Baubles:$baublesVersion:deobf")
-    compile("thaumcraft:Thaumcraft:$thaumcraftVersion:dev")
-    compile("codechicken:CodeChickenLib:$codechickenlibVersion:dev")
-    compile("codechicken:CodeChickenCore:$codechickencoreVersion:dev")
-    compile("codechicken:NotEnoughItems:$neiVersion:dev")
-
-    //Optional Libraries for Testing
-    runtimeOnly("mcp.mobius.waila:Waila:$wailaVersion")
-
-    //runtimeOnly("micdoodle8.mods:MicdoodleCore:$galacticraftVersion:Dev")
-    //runtimeOnly("micdoodle8.mods:GalacticraftCore:$galacticraftVersion:Dev")
-    //runtimeOnly("micdoodle8.mods:Galacticraft-Planets:$galacticraftVersion:Dev")
-    //runtimeOnly("com.github.GTNewHorizons:GalacticGregGT5:$galacticGregVersion")
-    //runtimeOnly("com.mod-buildcraft:buildcraft:$buildcraftVersion:dev")
-    //runtimeOnly("net.sengir.forestry:forestry_1.7.10:$forestryVersion:dev")
-    //runtimeOnly("com.enderio.core:EnderCore:$enderCoreVersion:dev")
-    //runtimeOnly("com.enderio:EnderIO:$enderioVersion:dev"){
-    //    exclude("com.enderio.core", "EnderCore")
-    //    exclude("mcp.mobius.waila", "Waila")
-    //}
-
-    configurations.all {
-        resolutionStrategy.cacheDynamicVersionsFor(30, "seconds")
-    }
-}
-
-
-
-
-tasks.withType<Jar> {
-    //Mark as outdated if versions change
-    this.inputs.properties += "version" to project.version
-    this.inputs.properties += "mcversion" to project.minecraft.version
-    this.archiveBaseName.set("TecTech-${project.minecraft.version}")
-
-    //Replace versions in mcmod.info
-    this.filesMatching("/mcmod.info") {
-        this.expand(
-                mapOf(
-                        "version" to project.version,
-                        "mcversion" to project.minecraft.version
-                )
-        )
-    }
-}
-
-//Load AVRcore
-val submodulesUpdate by tasks.creating(Exec::class) {
-    this.description = "Updates (and inits) git submodules"
-    this.group = "Build Setup"
-    this.commandLine("git", "submodule", "update", "--init", "--recursive", "--remote")
-}
-tasks.named("setupCIWorkspace") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("setupDevWorkspace") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("setupDecompWorkspace") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("compileJava") {
-    dependsOn(":submodulesUpdate")
-}
-tasks.named("sourceMainJava") {
-    dependsOn(":submodulesUpdate")
-}
-
-tasks.jar {
-    //Needed for access transformer which allows nerfing hardness of blocks
-    this.manifest.attributes(
-            mapOf(
-                    Pair("FMLAT", "tectech_at.cfg")
-            )
-    )
-}
-
-val sourcesJar by tasks.creating(Jar::class) {
-    this.from(sourceSets.main.get().allSource)
-    this.archiveClassifier.set("sources")
-}
-
-val devJar by tasks.creating(Jar::class) {
-    this.from(sourceSets.main.get().output)
-    this.archiveClassifier.set("dev")
-}
-
-artifacts {
-    this.archives(sourcesJar)
-    this.archives(devJar)
-}
-
-tasks.register("signJar") {
-    dependsOn("reobf")
-}
-
-//TODO Fix, but technically it was never fully implemented
-//signing {
-//    sign(tasks["jar"])
-//}
-//
-//tasks.named("signJar") {
-//    allprojects {
-//        extra["signing.keyId"] = propSign.getProperty("keyStoreAlias")
-//        extra["signing.secretKeyRingFile"] = propSign.getProperty("keyStore")
-//        extra["signing.password"] = propSign.getProperty("keyStorePass")
-//    }
-//    dependsOn(":reobf")
-//}
\ No newline at end of file
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000000..73d58c8479
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,27 @@
+// Add your dependencies here
+
+dependencies {
+    shadowImplementation("com.github.GTNewHorizons:AVRcore:master-SNAPSHOT")
+
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.40.18:dev")
+    compile("com.github.GTNewHorizons:Yamcl:0.5.82:dev")
+    compile("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev")
+    compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.1:dev")
+    compile("com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev")
+    compile("com.github.GTNewHorizons:StructureLib:1.0.14:dev")
+    compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
+
+    compile("com.github.GTNewHorizons:GTplusplus:1.7.24:dev")
+
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-70-GTNH:dev") {
+        transitive = false
+    }
+
+    compile("dan200.computercraft:ComputerCraft:1.75")
+    compile("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev")
+    compile("curse.maven:cofh-core-69162:2388751")
+    compile("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
+    compile("com.github.GTNewHorizons:Baubles:1.0.1.14:dev")
+
+    compile files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
+}
diff --git a/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar b/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
new file mode 100644
index 0000000000..e854bf7df9
Binary files /dev/null and b/dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar differ
diff --git a/draw_io_graph.png b/draw_io_graph.png
new file mode 100644
index 0000000000..241c41d604
Binary files /dev/null and b/draw_io_graph.png differ
diff --git a/gradle.properties b/gradle.properties
index 83dd93b556..3d49d30e98 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,64 @@
-#Dummy File, replaced in Jenkins
-keyStoreAlias=w
-keyStore=w
-keyStorePass=w
\ No newline at end of file
+modName = TecTech - Tec Technology!
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = tectech
+
+modGroup = com.github.technus.tectech
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = "Developer"
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = Reference.java
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenGroupName =
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile = tectech_at.cfg
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
+mixinPlugin =
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+mixinsPackage =
+# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
+# This parameter is for legacy compatability only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = false
+
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = true
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# projects. New projects should not use this parameter.
+customArchiveBaseName = TecTech
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960ec..5c2d1cf016 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5028f28f8e..3ab0b725ef 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index cccdd3d517..83f2acfdc3 100644
--- a/gradlew
+++ b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
diff --git a/gradlew.bat b/gradlew.bat
index f9553162f1..9618d8d960 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
diff --git a/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar b/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar
deleted file mode 100644
index 7a53464d53..0000000000
Binary files a/libs/CoFHCore-[1.7.10]3.1.4-329-dev.jar and /dev/null differ
diff --git a/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar b/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar
deleted file mode 100644
index 181475fc38..0000000000
Binary files a/libs/GT-PlusPlus-1.7.0-prerelease-8-final.jar and /dev/null differ
diff --git a/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar b/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar
deleted file mode 100644
index e854bf7df9..0000000000
Binary files a/libs/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar and /dev/null differ
diff --git a/real.gradle.properties b/real.gradle.properties
deleted file mode 100644
index ed62eeefe5..0000000000
--- a/real.gradle.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-projectVersion=4.10.4
-ic2Version=2.2.828-experimental
-gt5uVersion=experimental-SNAPSHOT
-yamcoreVersion=1.7.10-0.5.79
-opencomputersVersion=MC1.7.10-1.7.5.1291
-computercraftVersion=1.75
-baublesVersion=1.7.10-1.0.1.10
-thaumcraftVersion=1.7.10-4.2.3.5
-codechickenlibVersion=1.7.10-1.1.3.140
-codechickencoreVersion=1.7.10-1.0.7.47
-neiVersion=1.7.10-1.0.5.120
-wailaVersion=1.5.10_1.7.10
-galacticraftVersion=1.7-3.0.12.504
-galacticGregVersion=master-SNAPSHOT
-buildcraftVersion=7.1.23
-forestryVersion=4.2.16.64
-enderioVersion=1.7.10-2.3.0.429_beta
-enderCoreVersion=1.7.10-0.2.0.39_beta
\ No newline at end of file
diff --git a/repositories.gradle b/repositories.gradle
new file mode 100644
index 0000000000..a161653e0f
--- /dev/null
+++ b/repositories.gradle
@@ -0,0 +1,30 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    maven {
+        name = "GTNH Maven"
+        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+    }
+    maven {
+        name "OpenComputers Repo"
+        url = "http://maven.cil.li/"
+    }
+    maven {
+        name = "sponge"
+        url = "https://repo.spongepowered.org/repository/maven-public"
+    }
+    maven {
+        name = "ic2"
+        url = "http://maven.ic2.player.to/"
+        metadataSources {
+            mavenPom()
+            artifact()
+        }
+    }
+    maven {
+        url "https://cursemaven.com"
+    }
+    maven {
+        url = "https://jitpack.io"
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 10b8f69b1a..03701668ef 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -36,7 +36,7 @@ import java.util.Iterator;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);"
-        + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;" + "after:dreamcraft;")
+        + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;" + "after:dreamcraft;" + "required-after:structurelib;")
 public class TecTech {
     @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE)
     public static CommonProxy proxy;
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 4ebe84147f..f520885f9e 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -170,6 +170,23 @@ public class DreamCraftRecipeLoader {
                         getOrDefault("Trinium", Materials.Osmium).getMolten(1296),
                 }, CustomItemList.eM_Coil.get(4), 800, 2000000);
 
+        //infinite oil rig
+        TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.OilDrill3.get(1),
+                16777216, 2048, 2000000, 4, new ItemStack[]{
+                        ItemList.OilDrill3.get(1),
+                        GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4),
+                        GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 4),
+                        ItemList.Electric_Motor_UHV.get(4),
+                        ItemList.Electric_Pump_UHV.get(4),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4),
+                        ItemList.Sensor_UHV.get(3),
+                        ItemList.Field_Generator_UHV.get(3),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 12)
+                }, new FluidStack[]{
+                        Materials.SolderingAlloy.getMolten(1296),
+                        Materials.Neutronium.getMolten(576)
+                }, ItemList.OilDrillInfinite.get(1), 6000, 2000000);
+
         //Tesla Base
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 6),
@@ -260,9 +277,9 @@ public class DreamCraftRecipeLoader {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UIV_UEV").get(1), CustomItemList.eM_dynamoMulti4_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(4608), CustomItemList.eM_dynamoMulti16_UEV.get(1), 200, 2000000);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UIV_UEV").get(1), CustomItemList.eM_dynamoMulti16_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(4608), CustomItemList.eM_dynamoMulti64_UEV.get(1), 400, 2000000);
 
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Hatch_Dynamo_UIV").get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2)}, Materials.Silver.getMolten(8000), CustomItemList.eM_dynamoMulti4_UIV.get(1), 100, 8000000);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UMV_UIV").get(1), CustomItemList.eM_dynamoMulti4_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(8000), CustomItemList.eM_dynamoMulti16_UIV.get(1), 200, 8000000);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UMV_UIV").get(1), CustomItemList.eM_dynamoMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(8000), CustomItemList.eM_dynamoMulti64_UIV.get(1), 400, 8000000);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Hatch_Dynamo_UIV").get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2)}, Materials.Silver.getMolten(9216), CustomItemList.eM_dynamoMulti4_UIV.get(1), 100, 8000000);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UMV_UIV").get(1), CustomItemList.eM_dynamoMulti4_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(9216), CustomItemList.eM_dynamoMulti16_UIV.get(1), 200, 8000000);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UMV_UIV").get(1), CustomItemList.eM_dynamoMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(9216), CustomItemList.eM_dynamoMulti64_UIV.get(1), 400, 8000000);
 
         //Energy Hatches  IV-UIV
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hatch_Energy_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2)}, Materials.Silver.getMolten(144), CustomItemList.eM_energyMulti4_IV.get(1), 100, 1920);
@@ -289,9 +306,9 @@ public class DreamCraftRecipeLoader {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UIV_UEV").get(1), CustomItemList.eM_energyMulti4_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(4608), CustomItemList.eM_energyMulti16_UEV.get(1), 200, 2000000);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UIV_UEV").get(1), CustomItemList.eM_energyMulti16_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.Draconium, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(4608), CustomItemList.eM_energyMulti64_UEV.get(1), 400, 2000000);
 
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Hatch_Energy_UIV").get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2)}, Materials.Silver.getMolten(8000), CustomItemList.eM_energyMulti4_UIV.get(1), 100, 8000000);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UMV_UIV").get(1), CustomItemList.eM_energyMulti4_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(8000), CustomItemList.eM_energyMulti16_UIV.get(1), 200, 8000000);
-        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UMV_UIV").get(1), CustomItemList.eM_energyMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(8000), CustomItemList.eM_energyMulti64_UIV.get(1), 400, 8000000);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Hatch_Energy_UIV").get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2)}, Materials.Silver.getMolten(9216), CustomItemList.eM_energyMulti4_UIV.get(1), 100, 8000000);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("Transformer_UMV_UIV").get(1), CustomItemList.eM_energyMulti4_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 4)}, Materials.Electrum.getMolten(9216), CustomItemList.eM_energyMulti16_UIV.get(1), 200, 8000000);
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{getItemContainer("WetTransformer_UMV_UIV").get(1), CustomItemList.eM_energyMulti16_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt12, Materials.NetherStar, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 6)}, Materials.Tungsten.getMolten(9216), CustomItemList.eM_energyMulti64_UIV.get(1), 400, 8000000);
 
         //Buck Converter IV-UIV
         if (Loader.isModLoaded("bartworks")) {
@@ -445,7 +462,7 @@ public class DreamCraftRecipeLoader {
                 ItemList.Emitter_ZPM.get(8),
                 ItemList.Robot_Arm_ZPM.get(1),
                 ItemList.Electric_Motor_ZPM.get(2),
-                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 1)},
+                new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 1},
                 new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2)},
                 new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16)},
                 CustomItemList.DATApipe.get(2),
@@ -576,7 +593,7 @@ public class DreamCraftRecipeLoader {
         //Quantum Computer
         GT_Values.RA.addAssemblylineRecipe(ItemList.Tool_DataOrb.get(1), 20000, new Object[]{
                 CustomItemList.Machine_Multi_Switch.get(1),
-                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 2)},
+                new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 2},
                 ItemList.Tool_DataOrb.get(1),
                 ItemList.Cover_Screen.get(1),
                 new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 8)},
@@ -592,7 +609,7 @@ public class DreamCraftRecipeLoader {
         GT_Values.RA.addAssemblylineRecipe(getItemContainer("ScannerZPM").get(1), 80000, new Object[]{
                 CustomItemList.Machine_Multi_Switch.get(1),
                 ItemList.Sensor_ZPM.get(8),
-                new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Superconductor, 4)},
+                new Object[]{OrePrefixes.circuit.get(Materials.Superconductor), 4},
                 ItemList.Field_Generator_ZPM.get(1),
                 ItemList.Electric_Motor_ZPM.get(2),
                 new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4)},
@@ -711,7 +728,7 @@ public class DreamCraftRecipeLoader {
                         new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
                 }, CustomItemList.Machine_Multi_Infuser.get(1), 8000, 2000000);
 
-        //Motor UV-UHV
+        //Motor UHV-UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Electric_Motor_UV.get(1L),
                 24000, 32, 100000, 4, new ItemStack[]{
                         GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 4L),
@@ -750,14 +767,14 @@ public class DreamCraftRecipeLoader {
                         Materials.SolderingAlloy.getMolten(5184),
                         Materials.Lubricant.getFluid(8000)}, ItemList.Electric_Motor_UEV.get(1L), 2000, 800000);
 
-        //Pumps UV-UHV
+        //Pumps UHV-UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Electric_Pump_UV.get(1L),
-                24000, 32, 100000, 4, new ItemStack[]{
+                24000, 32, 100000, 4, new Object[]{
                         ItemList.Electric_Motor_UHV.get(1L),
                         GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 16L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, Materials.AnySyntheticRubber, 32L),
+                        new Object[]{OrePrefixes.ring.get(Materials.AnySyntheticRubber), 32L},
                         GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.CosmicNeutronium, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L)}, new FluidStack[]{
                         Materials.Naquadria.getMolten(2592),
@@ -765,44 +782,45 @@ public class DreamCraftRecipeLoader {
                         Materials.Lubricant.getFluid(4000)}, ItemList.Electric_Pump_UHV.get(1), 1000, 200000);
 
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Electric_Pump_UHV.get(1L),
-                48000, 64, 200000, 8, new ItemStack[]{
+                48000, 64, 200000, 8, new Object[]{
                         ItemList.Electric_Motor_UEV.get(1L),
                         GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 2L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L),
-                        GT_OreDictUnificator.get(OrePrefixes.ring, (Materials.AnySyntheticRubber), 64L),
+                        new Object[]{OrePrefixes.ring.get(Materials.AnySyntheticRubber), 64L},
                         GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 4L),
                         GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L)}, new FluidStack[]{
                         Materials.Quantium.getMolten(2592),
                         Materials.SolderingAlloy.getMolten(5184),
                         Materials.Lubricant.getFluid(8000)}, ItemList.Electric_Pump_UEV.get(1), 2000, 800000);
 
-        //Conveyor Belt UV-UHV
+        //Conveyor Belt UHV-UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Conveyor_Module_UV.get(1L),
-                24000, 32, 100000, 4, new ItemStack[]{
+                24000, 32, 100000, 4, new Object[]{
                         ItemList.Electric_Motor_UHV.get(2L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 2L),
                         GT_OreDictUnificator.get(OrePrefixes.ring, Materials.CosmicNeutronium, 8L),
                         GT_OreDictUnificator.get(OrePrefixes.round, Materials.CosmicNeutronium, 64L),
-                        GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L)}, new FluidStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 2L),
+                        new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 40L}}, new FluidStack[]{
                         Materials.Naquadria.getMolten(2592),
                         Materials.SolderingAlloy.getMolten(2592),
-                        Materials.Lubricant.getFluid(4000),
-                        Materials.Silicone.getMolten(5760)}, ItemList.Conveyor_Module_UHV.get(1), 1000, 200000);
+                        Materials.Lubricant.getFluid(4000)}, ItemList.Conveyor_Module_UHV.get(1), 1000, 200000);
 
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Conveyor_Module_UHV.get(1L),
-                48000, 64, 200000, 8, new ItemStack[]{
+                48000, 64, 200000, 8, new Object[]{
                         ItemList.Electric_Motor_UEV.get(2L),
                         GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 2L),
                         GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L),
                         GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 64L),
-                        GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L)}, new FluidStack[]{
+                        GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 2L),
+                        new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 64L},
+                        new Object[]{OrePrefixes.plate.get(Materials.AnySyntheticRubber), 16L}}, new FluidStack[]{
                         Materials.Quantium.getMolten(2592),
                         Materials.SolderingAlloy.getMolten(5184),
-                        Materials.Lubricant.getFluid(8000),
-                        Materials.Silicone.getMolten(11520)}, ItemList.Conveyor_Module_UEV.get(1), 2000, 800000);
+                        Materials.Lubricant.getFluid(8000)}, ItemList.Conveyor_Module_UEV.get(1), 2000, 800000);
 
-        //Piston UV-UHV
+        //Piston UHV-UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Electric_Piston_UV.get(1L),
                 24000, 32, 100000, 4, new ItemStack[]{
                         ItemList.Electric_Motor_UHV.get(1L),
@@ -831,7 +849,7 @@ public class DreamCraftRecipeLoader {
                         Materials.SolderingAlloy.getMolten(5184),
                         Materials.Lubricant.getFluid(8000)}, ItemList.Electric_Piston_UEV.get(1), 2000, 800000);
 
-        //Robot Arm UV-UHV
+        //Robot Arm UHV-UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Robot_Arm_UV.get(1L),
                 24000, 32, 100000, 4, new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 8L),
@@ -862,7 +880,7 @@ public class DreamCraftRecipeLoader {
                         Materials.SolderingAlloy.getMolten(9216),
                         Materials.Lubricant.getFluid(8000)}, ItemList.Robot_Arm_UEV.get(1L), 2000, 800000);
 
-        //Emitter UV-UHV
+        //Emitter UHV-UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Emitter_UV.get(1L),
                 24000, 32, 100000, 4, new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L),
@@ -895,7 +913,7 @@ public class DreamCraftRecipeLoader {
                         Materials.SolderingAlloy.getMolten(9216)},
                 ItemList.Emitter_UEV.get(1L), 2000, 800000);
 
-        //Sensor UV-UHV
+        //Sensor UHV-UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Sensor_UV.get(1L),
                 24000, 32, 100000, 4, new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L),
@@ -928,7 +946,7 @@ public class DreamCraftRecipeLoader {
                         Materials.SolderingAlloy.getMolten(9216)},
                 ItemList.Sensor_UEV.get(1L), 2000, 800000);
 
-        //Fieldgen UV and UHV
+        //Fieldgen UHV and UEV
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Field_Generator_UV.get(1),
                 48000, 64, 200000, 8, new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L),
@@ -971,7 +989,7 @@ public class DreamCraftRecipeLoader {
                         Materials.SolderingAlloy.getMolten(9216)},
                 ItemList.Field_Generator_UEV.get(1L), 4000, 800000);
 
-        //UHV Energy Hatch
+        //UHV-UMV Energy Hatch & Dynamo
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Energy_UV.get(1L),
                 24000, 16, 50000, 2, new Object[]{
                         ItemList.Hull_MAX.get(1L),
@@ -992,7 +1010,7 @@ public class DreamCraftRecipeLoader {
                         new FluidStack(FluidRegistry.getFluid("ic2coolant"), 16000),
                         Materials.SolderingAlloy.getMolten(5760),
                 }, ItemList.Hatch_Energy_MAX.get(1L), 1000, 2000000);
-
+        
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Dynamo_UV.get(1L),
                 48000, 32, 100000, 4, new Object[]{
                         ItemList.Hull_MAX.get(1L),
@@ -1014,9 +1032,129 @@ public class DreamCraftRecipeLoader {
                         Materials.SolderingAlloy.getMolten(5760)},
                 ItemList.Hatch_Dynamo_MAX.get(1L), 1000, 2000000);
 
+        TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Energy_MAX.get(1L),
+                48000, 32, 100000, 4, new Object[]{
+                		getItemContainer("Hull_UEV").get(1L),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 4L),
+                        ItemList.Circuit_Chip_QPIC.get(4L),
+                        new Object[]{OrePrefixes.circuit.get(Materials.Bio), 2L},
+                        ItemList.UHV_Coil.get(4L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Electric_Pump_UEV.get(1L)},
+                new FluidStack[]{
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000),
+                        Materials.SolderingAlloy.getMolten(11520),
+                        Materials.UUMatter.getFluid(8000L)},
+                getItemContainer("Hatch_Energy_UEV").get(1L), 1000, 8000000);
+        
+        TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Hatch_Dynamo_MAX.get(1L),
+                96000, 64, 200000, 8, new Object[]{
+                		getItemContainer("Hull_UEV").get(1L),
+                        GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 16L),
+                        ItemList.Circuit_Chip_QPIC.get(4L),
+                        new Object[]{OrePrefixes.circuit.get(Materials.Bio), 2L},
+                        ItemList.UHV_Coil.get(4L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Electric_Pump_UEV.get(1L)},
+                new FluidStack[]{
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000),
+                        Materials.SolderingAlloy.getMolten(11520),
+                        Materials.UUMatter.getFluid(8000L)},
+                getItemContainer("Hatch_Dynamo_UEV").get(1L), 1000, 8000000);
+
+        TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UEV").get(1L),
+                96000, 64, 200000, 8, new Object[]{
+                		getItemContainer("Hull_UIV").get(1L),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUHV, 8L),
+                        ItemList.Circuit_Chip_QPIC.get(4L),
+                        getItemContainer("NanoCircuit").get(2),
+                        ItemList.UHV_Coil.get(8L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Electric_Pump_UEV.get(2L)},
+                new FluidStack[]{
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64000),
+                        Materials.SolderingAlloy.getMolten(23040),
+                        Materials.UUMatter.getFluid(16000L)},
+                getItemContainer("Hatch_Energy_UIV").get(1L), 1000, 16000000);
+        
+        TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Dynamo_UEV").get(1L),
+                192000, 128, 400000, 16, new Object[]{
+                		getItemContainer("Hull_UIV").get(1L),
+                        GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 32L),
+                        ItemList.Circuit_Chip_QPIC.get(4L),
+                        getItemContainer("NanoCircuit").get(2),
+                        ItemList.UHV_Coil.get(8L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Electric_Pump_UEV.get(2L)},
+                new FluidStack[]{
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 64000),
+                        Materials.SolderingAlloy.getMolten(23040),
+                        Materials.UUMatter.getFluid(16000L)},
+                getItemContainer("Hatch_Dynamo_UIV").get(1L), 1000, 16000000);
+        
+        TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Energy_UIV").get(1L),
+        		192000, 128, 400000, 16, new Object[]{
+        				getItemContainer("Hull_UMV").get(1L),
+                        GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 16L),
+                        ItemList.Circuit_Chip_QPIC.get(4L),
+                        getItemContainer("QuantumCircuit").get(2),
+                        ItemList.UHV_Coil.get(16L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Electric_Pump_UEV.get(4L)},
+                new FluidStack[]{
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 128000),
+                        Materials.SolderingAlloy.getMolten(46080),
+                        Materials.UUMatter.getFluid(32000L)},
+                getItemContainer("Hatch_Energy_UMV").get(1L), 1000, 32000000);
+        
+        TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("Hatch_Dynamo_UIV").get(1L),
+        		384000, 256, 800000, 32, new Object[]{
+        				getItemContainer("Hull_UMV").get(1L),
+                        GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 64L),
+                        ItemList.Circuit_Chip_QPIC.get(4L),
+                        getItemContainer("QuantumCircuit").get(2),
+                        ItemList.UHV_Coil.get(16L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Electric_Pump_UEV.get(4L)},
+                new FluidStack[]{
+                        new FluidStack(FluidRegistry.getFluid("ic2coolant"), 128000),
+                        Materials.SolderingAlloy.getMolten(46080),
+                        Materials.UUMatter.getFluid(32000L)},
+                getItemContainer("Hatch_Dynamo_UMV").get(1L), 1000, 32000000);
+
         //UHV Circuit
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Wetwaresupercomputer.get(1L),
-                24000, 64, 50000, 4, new ItemStack[]{
+                24000, 64, 50000, 4, new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 2),
                         ItemList.Circuit_Wetwaresupercomputer.get(2L),
                         ItemList.ZPM_Coil.get(16L),
@@ -1026,7 +1164,7 @@ public class DreamCraftRecipeLoader {
                         ItemList.Circuit_Parts_DiodeASMD.get(16L),
                         ItemList.Circuit_Chip_Ram.get(48L),
                         GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64L),
-                        GT_OreDictUnificator.get(OrePrefixes.foil, (Materials.AnySyntheticRubber), 64L),
+                        new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L},
                 }, new FluidStack[]{
                         Materials.SolderingAlloy.getMolten(2880L),
                         new FluidStack(FluidRegistry.getFluid("ic2coolant"), 10000),
@@ -1035,7 +1173,7 @@ public class DreamCraftRecipeLoader {
 
         //Bio Chips
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowarecomputer.get(1L),
-                48000, 128, 500000, 8, new ItemStack[]{
+                48000, 128, 500000, 8, new Object[]{
                         ItemList.Circuit_Board_Bio_Ultra.get(2L),
                         ItemList.Circuit_Biowarecomputer.get(2L),
                         ItemList.Circuit_Parts_TransistorASMD.get(16L),
@@ -1045,7 +1183,7 @@ public class DreamCraftRecipeLoader {
                         ItemList.Circuit_Chip_NOR.get(32L),
                         ItemList.Circuit_Chip_Ram.get(64L),
                         GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NiobiumTitanium, 32L),
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 16L),
+                        new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L},
                 }, new FluidStack[]{
                         Materials.SolderingAlloy.getMolten(1440L),
                         Materials.BioMediumSterilized.getFluid(1440L),
@@ -1054,7 +1192,7 @@ public class DreamCraftRecipeLoader {
                 ItemList.Circuit_Biowaresupercomputer.get(1L), 4000, 500000);
 
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biowaresupercomputer.get(1L),
-                96000, 256, 1000000, 16, new ItemStack[]{
+                96000, 256, 1000000, 16, new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 4L),
                         ItemList.Circuit_Biowaresupercomputer.get(2L),
                         ItemList.UV_Coil.get(16L),
@@ -1064,7 +1202,7 @@ public class DreamCraftRecipeLoader {
                         ItemList.Circuit_Parts_DiodeASMD.get(24L),
                         ItemList.Circuit_Chip_Ram.get(64L),
                         GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 64),
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 64),
+                        new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L},
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64)
                 }, new FluidStack[]{
                         Materials.SolderingAlloy.getMolten(2880L),
@@ -1072,9 +1210,9 @@ public class DreamCraftRecipeLoader {
                         new FluidStack(FluidRegistry.getFluid("ic2coolant"), 20000)
                 }, ItemList.Circuit_Biomainframe.get(1L), 6000, 2000000);
 
-        //GTNH Circuits
+        //GTNH UIV, UMV, UXV Circuits 
         TT_recipeAdder.addResearchableAssemblylineRecipe(ItemList.Circuit_Biomainframe.get(1L),
-                192000, 512, 2000000, 32, new ItemStack[]{
+                192000, 512, 2000000, 32, new Object[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 8),
                         ItemList.Circuit_Biomainframe.get(2L),
                         ItemList.Circuit_Parts_CapacitorASMD.get(32L),
@@ -1085,7 +1223,7 @@ public class DreamCraftRecipeLoader {
                         ItemList.Circuit_Chip_NPIC.get(64L),
                         GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Draconium, 64),
                         GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64),
-                        GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silicone, 64),
+                        new Object[]{OrePrefixes.foil.get(Materials.AnySyntheticRubber), 64L},
                         GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 64)
                 }, new FluidStack[]{
                         Materials.SolderingAlloy.getMolten(3744L),
@@ -1117,7 +1255,7 @@ public class DreamCraftRecipeLoader {
         TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("PikoCircuit").get(1L),
                 720000, 2048, 8000000, 128, new ItemStack[]{
                         GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 16),
-                        getItemContainer("PikoCircuit").get(8L),
+                        getItemContainer("PikoCircuit").get(2L),
                         ItemList.Circuit_Parts_CapacitorASMD.get(64L),
                         ItemList.Circuit_Parts_DiodeASMD.get(64L),
                         ItemList.Circuit_Parts_TransistorASMD.get(64L),
@@ -1133,31 +1271,31 @@ public class DreamCraftRecipeLoader {
                         Materials.Osmium.getMolten(2304L)
                 }, getItemContainer("QuantumCircuit").get(1L), 20000, 32000000);
 
-        //Stargate Stuff
+        //Stargate Recipes
         if (Loader.isModLoaded("eternalsingularity") && Loader.isModLoaded("SGCraft")) {
             TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Infinity, 1L),
-                    192000, 512, 2000000, 32, new ItemStack[]{
+                    32000000, 8192, 128000000, 1, new ItemStack[]{
                             GT_ModHandler.getModItem("eternalsingularity", "eternal_singularity", 1L),
-                            ItemList.Sensor_UV.get(16L),
+                            ItemList.Sensor_UEV.get(16L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 16L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L),
-                            getItemContainer("NanoCircuit").get(1L).splitStack(16)
+                            getItemContainer("QuantumCircuit").get(1L).splitStack(16)
                     },
                     new FluidStack[]{
                             Materials.Neutronium.getMolten(36864L),
                             Materials.Tritanium.getMolten(36864L),
-                            Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(36864L),
+                            Materials.Longasssuperconductornameforuhvwire.getMolten(36864L),
                             Materials.Silver.getPlasma(36864L)
                     },
-                    getItemContainer("StargateShieldingFoil").get(1L), 72000, 2000000);
+                    getItemContainer("StargateShieldingFoil").get(1L), 72000, 500000000);
 
             TT_recipeAdder.addResearchableAssemblylineRecipe(getItemContainer("StargateShieldingFoil").get(1L),
-                    192000, 512, 2000000, 32, new ItemStack[]{
-                            ItemList.Electric_Piston_UV.get(16L),
-                            ItemList.Electric_Motor_UV.get(64L),
+                    32000000, 8192, 128000000, 1, new ItemStack[]{
+                            ItemList.Electric_Piston_UEV.get(16L),
+                            ItemList.Electric_Motor_UEV.get(64L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 16L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 64L),
                             GT_OreDictUnificator.get(OrePrefixes.block, Materials.NetherStar, 64L),
@@ -1166,18 +1304,18 @@ public class DreamCraftRecipeLoader {
                             GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ardite, 8L),
                             GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Ruby, 16L),
                             GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Jasper, 16L),
-                            getItemContainer("NanoCircuit").get(1L).splitStack(32)
+                            getItemContainer("QuantumCircuit").get(1L).splitStack(32)
                     },
                     new FluidStack[]{
                             Materials.Neutronium.getMolten(9216L),
                             Materials.Tritanium.getMolten(9216L),
-                            Materials.Tetranaquadahdiindiumhexaplatiumosminid.getMolten(9216L),
+                            Materials.Longasssuperconductornameforuhvwire.getMolten(9216L),
                             Materials.Silver.getPlasma(9216L)
                     },
-                    getItemContainer("StargateChevron").get(1L), 72000, 2000000);
+                    getItemContainer("StargateChevron").get(1L), 72000, 500000000);
 
             TT_recipeAdder.addResearchableAssemblylineRecipe(GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L),
-                    192000, 512, 2000000, 32, new ItemStack[]{
+                    32000000, 8192, 128000000, 1, new ItemStack[]{
                             GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 64L),
                             GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 64L),
                             GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.CosmicNeutronium, 64L),
@@ -1189,7 +1327,7 @@ public class DreamCraftRecipeLoader {
                             Materials.Tritanium.getMolten(73728L),
                             Materials.Concrete.getMolten(73728L)
                     },
-                    getItemContainer("StargateFramePart").get(1L), 72000, 2000000);
+                    getItemContainer("StargateFramePart").get(1L), 72000, 500000000);
         }
         //endregion
         
@@ -1263,7 +1401,7 @@ public class DreamCraftRecipeLoader {
                 ItemList.Circuit_Parts_DiodeASMD.get(64),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUHV, 64),
         }, new FluidStack[]{
-                Materials.SolderingAlloy.getMolten(3760),
+                Materials.SolderingAlloy.getMolten(4608),
                 Materials.Naquadria.getMolten(9216),
                 new FluidStack(FluidRegistry.getFluid("ic2coolant"), 32000)
         }, ItemList.ZPM3.get(1), 4000, 1600000);
@@ -1712,6 +1850,11 @@ public class DreamCraftRecipeLoader {
                 ItemList.Emitter_LuV.get(1),
                 ItemList.Electric_Pump_LuV.get(1),
         }, Materials.Chrome.getMolten(288), CustomItemList.enderLinkFluidCover.getWithDamage(1, 0), 320, 30720);
+        //Power Pass Upgrade Cover
+        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
+        		CustomItemList.Machine_Multi_Transformer.get(1),
+                GT_Utility.getIntegratedCircuit(1)
+        }, null, CustomItemList.powerPassUpgradeCover.getWithDamage(1, 0), 320, 30720);
         //endregion
 
         //region recycling
diff --git a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
index 67a363fc6c..65219271f9 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/gtpp/GtppAtomLoader.java
@@ -50,7 +50,11 @@ public class GtppAtomLoader {
 
             Class<?> clazz=Class.forName("gtPlusPlus.core.material.Material");
             getUnlocalizedName=clazz.getMethod("getUnlocalizedName");
-            getFluid=clazz.getMethod("getFluid", int.class);
+            try{
+                getFluid=clazz.getMethod("getFluidStack", int.class);
+            }catch (Exception e){
+                getFluid=clazz.getMethod("getFluid", int.class);
+            }
 
             clazz=Class.forName("gtPlusPlus.core.material.MaterialGenerator");
             generate=clazz.getMethod("generate", Class.forName("gtPlusPlus.core.material.Material"), boolean.class, boolean.class);
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
index 35d3a1b91f..a335b81793 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompat.java
@@ -10,11 +10,11 @@ import net.minecraft.tileentity.TileEntity;
 public class EssentiaCompat {
     public static EssentiaCompat essentiaContainerCompat;
 
-    public boolean check(GT_MetaTileEntity_MultiblockBase_EM meta){
+    public <T extends GT_MetaTileEntity_MultiblockBase_EM> boolean check(T meta,TileEntity te){
         return false;
     }
 
-    public TileEntity getContainer(GT_MetaTileEntity_MultiblockBase_EM meta){
+    public <T extends GT_MetaTileEntity_MultiblockBase_EM> TileEntity getContainer(T meta){
         return null;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
index 37df2c48cc..bd20269944 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/EssentiaCompatEnabled.java
@@ -16,13 +16,12 @@ import static com.github.technus.tectech.compatibility.thaumcraft.elementalMatte
  */
 public class EssentiaCompatEnabled extends EssentiaCompat {
     @Override
-    public boolean check(GT_MetaTileEntity_MultiblockBase_EM meta) {
-        TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing());
-        return tile instanceof TileEssentiaReservoir || tile instanceof TileJarFillable;
+    public <T extends GT_MetaTileEntity_MultiblockBase_EM> boolean check(T meta,TileEntity te) {
+        return te instanceof TileEssentiaReservoir || te instanceof TileJarFillable;
     }
 
     @Override
-    public TileEntity getContainer(GT_MetaTileEntity_MultiblockBase_EM meta) {
+    public <T extends GT_MetaTileEntity_MultiblockBase_EM> TileEntity getContainer(T meta) {
         TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing());
         return tile!=null && !tile.isInvalid() && tile instanceof TileEssentiaReservoir || tile instanceof TileJarFillable ?tile:null;
     }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 267af79784..b061281daa 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -1,21 +1,19 @@
 package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.structure.Structure;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.StructureLibAPI;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -26,13 +24,13 @@ import net.minecraftforge.common.util.ForgeDirection;
 import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
-import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_ITEM_DIMINISHED;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
+import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static gregtech.api.enums.GT_Values.E;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -41,22 +39,24 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final String[][] shape = new String[][]{
-            {"   ", " . ", "   ",},
-            {"0A0", E, "0A0",},
-            {"121", "232", "121",},
-            {"\"\"\"", "\"2\"", "\"\"\"",},
-            {"202", "0!0", "202",},
-    };
-    private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{0, 0, 4, 8};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_essentiaDequantizer>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_essentiaDequantizer::addClassicToMachineList,
-            GT_MetaTileEntity_EM_essentiaDequantizer::addElementalInputToMachineList,
-            GT_MetaTileEntity_EM_essentiaDequantizer::addElementalMufflerToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaDequantizer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_essentiaDequantizer>builder()
+            .addShape("main", new String[][]{
+                    {"&&&", "&~&", "&&&",},
+                    {"0 0", " * ", "0 0",},
+                    {"121", "232", "121",},
+                    {"$$$", "$2$", "$$$",},
+                    {"202", "0!0", "202",},})
+            .addElement('0', ofBlockAnyMeta(QuantumGlassBlock.INSTANCE))
+            .addElement('1', ofBlock(sBlockCasingsTT, 0))
+            .addElement('2', ofBlock(sBlockCasingsTT, 4))
+            .addElement('3', ofBlock(sBlockCasingsTT, 8))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaDequantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaDequantizer::addElementalInputToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaDequantizer::addElementalMufflerToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('*', ofTileAdder(essentiaContainerCompat::check, StructureLibAPI.getBlockHint(),12))
+            .build();
+
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.emtoessentia.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -83,7 +83,7 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
+        return structureCheck_EM("main", 1, 1, 0);
     }
 
     @Override
@@ -130,12 +130,12 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
         TileEntity container = essentiaContainerCompat.getContainer(this);
         if (container == null) {
             stopMachine();
-        }else{
-            if(!essentiaContainerCompat.putInContainer(container,outputEssentiaName)){
+        } else {
+            if (!essentiaContainerCompat.putInContainer(container, outputEssentiaName)) {
                 stopMachine();
             }
         }
-        outputEssentiaName=null;
+        outputEssentiaName = null;
     }
 
     @Override
@@ -156,21 +156,25 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
         IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ;
+        int                 xDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX;
+        int                 yDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY;
+        int                 zDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ;
         if (hintsOnly) {
             TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(),
                     iGregTechTileEntity.getXCoord() + xDir,
                     iGregTechTileEntity.getYCoord() + yDir,
                     iGregTechTileEntity.getZCoord() + zDir,
-                    TT_Container_Casings.sHintCasingsTT, 12);
+                    StructureLibAPI.getBlockHint(), 12);
         } else {
             if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir).getMaterial() == Material.air) {
-                iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2);
+                iGregTechTileEntity.getWorld().setBlock(
+                        iGregTechTileEntity.getXCoord() + xDir,
+                        iGregTechTileEntity.getYCoord() + yDir,
+                        iGregTechTileEntity.getZCoord() + zDir,
+                        StructureLibAPI.getBlockHint(), 12, 2);
             }
         }
-        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, iGregTechTileEntity, getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
     }
 
     @Override
@@ -181,12 +185,12 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
     @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         super.saveNBTData(aNBT);
-        aNBT.setString("eOutputEssentia",outputEssentiaName);
+        aNBT.setString("eOutputEssentia", outputEssentiaName);
     }
 
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
         super.loadNBTData(aNBT);
-        outputEssentiaName=aNBT.getString("eOutputEssentia");
+        outputEssentiaName = aNBT.getString("eOutputEssentia");
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index a381a37f89..6d315fa30a 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -2,22 +2,20 @@ package com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition;
-import com.github.technus.tectech.mechanics.structure.Structure;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_quantizer;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.StructureLibAPI;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -26,11 +24,11 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static gregtech.api.enums.GT_Values.E;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -39,22 +37,24 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final String[][] shape = new String[][]{
-            {"   ", " . ", "   ",},
-            {"0A0", E, "0A0",},
-            {"121", "232", "121",},
-            {"\"\"\"", "\"1\"", "\"\"\"",},
-            {"010", "1!1", "010",},
-    };
-    private static final Block[] blockType = new Block[]{QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{0, 4, 0, 8};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_essentiaQuantizer>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_essentiaQuantizer::addClassicToMachineList,
-            GT_MetaTileEntity_EM_essentiaQuantizer::addElementalOutputToMachineList,
-            GT_MetaTileEntity_EM_essentiaQuantizer::addElementalMufflerToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_essentiaQuantizer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_essentiaQuantizer>builder()
+            .addShape("main", new String[][]{
+                    {"&&&", "&~&", "&&&",},
+                    {"0 0", " * ", "0 0",},
+                    {"121", "232", "121",},
+                    {"$$$", "$1$", "$$$",},
+                    {"010", "1!1", "010",},})
+            .addElement('0', ofBlockAnyMeta(QuantumGlassBlock.INSTANCE))
+            .addElement('1', ofBlock(sBlockCasingsTT, 4))
+            .addElement('2', ofBlock(sBlockCasingsTT, 0))
+            .addElement('3', ofBlock(sBlockCasingsTT, 8))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaQuantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaQuantizer::addElementalOutputToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_essentiaQuantizer::addElementalMufflerToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('*', ofTileAdder(essentiaContainerCompat::check, StructureLibAPI.getBlockHint(),12))
+            .build();
+
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.essentiatoem.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -79,7 +79,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return essentiaContainerCompat.check(this) && structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
+        return structureCheck_EM("main", 1, 1, 0);
     }
 
     @Override
@@ -138,13 +138,17 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
                     iGregTechTileEntity.getXCoord() + xDir,
                     iGregTechTileEntity.getYCoord() + yDir,
                     iGregTechTileEntity.getZCoord() + zDir,
-                    TT_Container_Casings.sHintCasingsTT, 12);
+                    StructureLibAPI.getBlockHint(), 12);
         } else {
             if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir).getMaterial() == Material.air) {
-                iGregTechTileEntity.getWorld().setBlock(iGregTechTileEntity.getXCoord() + xDir, iGregTechTileEntity.getYCoord() + yDir, iGregTechTileEntity.getZCoord() + zDir, TT_Container_Casings.sHintCasingsTT, 12, 2);
+                iGregTechTileEntity.getWorld().setBlock(
+                        iGregTechTileEntity.getXCoord() + xDir,
+                        iGregTechTileEntity.getYCoord() + yDir,
+                        iGregTechTileEntity.getZCoord() + zDir,
+                        StructureLibAPI.getBlockHint(), 12, 2);
             }
         }
-        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, iGregTechTileEntity, getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java b/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java
deleted file mode 100644
index dd5cd59ac7..0000000000
--- a/src/main/java/com/github/technus/tectech/entity/fx/BlockHint.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.github.technus.tectech.entity.fx;
-
-import com.github.technus.tectech.TecTech;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Dyes;
-import net.minecraft.block.Block;
-import net.minecraft.client.particle.EntityFX;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-import org.lwjgl.opengl.GL11;
-
-@SideOnly(Side.CLIENT)
-public class BlockHint extends EntityFX {
-    private IIcon[] icons = new IIcon[6];
-    private short[] mRGBa = Dyes._NULL.mRGBa;
-
-    public BlockHint(World world){
-        this(world,0,0,0, Blocks.stone,0);
-    }
-
-    /**
-     *
-     * @param world
-     * @param x
-     * @param y
-     * @param z
-     * @param icons DOWN, UP, NORTH, SOUTH, WEST, EAST
-     */
-    public BlockHint(World world, int x, int y, int z, IIcon[] icons) {
-        super(world, x + .25, y + .5, z + .25);
-        particleGravity = 0;
-        prevPosX = posX;
-        prevPosY = posY;
-        prevPosZ = posZ;
-        noClip = true;
-        particleMaxAge = 2000 + TecTech.RANDOM.nextInt(200);
-        this.icons=icons;
-    }
-
-    public BlockHint(World world, int x, int y, int z, Block block, int meta) {
-        super(world, x+.25, y+.5, z+.25);
-        particleGravity = 0;
-        prevPosX = posX;
-        prevPosY = posY;
-        prevPosZ = posZ;
-        noClip = true;
-        particleMaxAge = 2000 + TecTech.RANDOM.nextInt(200);
-        for (int i = 0; i < 6; i++) {
-            icons[i] = block.getIcon(i, meta);
-        }
-    }
-
-    public BlockHint withColorTint(short[] coloure){
-        this.mRGBa =coloure;
-        return this;
-    }
-
-    @Override
-    public void renderParticle(Tessellator tes, float subTickTime, float p_70539_3_, float p_70539_4_, float p_70539_5_, float p_70539_6_, float p_70539_7_) {
-        float size = .5f;
-        float X = (float) (prevPosX + (posX - prevPosX) * (double) subTickTime - EntityFX.interpPosX);
-        float Y = (float) (prevPosY + (posY - prevPosY) * (double) subTickTime - EntityFX.interpPosY) - size / 2;
-        float Z = (float) (prevPosZ + (posZ - prevPosZ) * (double) subTickTime - EntityFX.interpPosZ);
-        GL11.glDisable(GL11.GL_CULL_FACE);
-        GL11.glDepthMask(false);
-        tes.setColorRGBA((int) (mRGBa[0] * .9F), (int) (mRGBa[1] * .95F), (int) (mRGBa[2] * 1F), 192);
-
-        //var8, var9 - X U
-        //var 10, var 11 - Y V
-        for(int i=0;i<6;i++){
-            if(icons[i]==null) {
-                continue;
-            }
-            double u=icons[i].getMinU();
-            double U=icons[i].getMaxU();
-            double v=icons[i].getMinV();
-            double V=icons[i].getMaxV();
-            switch (i){//{DOWN, UP, NORTH, SOUTH, WEST, EAST}
-                case 0:
-                    tes.addVertexWithUV(X, Y, Z + size, u, V);
-                    tes.addVertexWithUV(X, Y, Z, u, v);
-                    tes.addVertexWithUV(X + size, Y, Z, U, v);
-                    tes.addVertexWithUV(X + size, Y, Z + size, U, V);
-                    break;
-                case 1:
-                    tes.addVertexWithUV(X, Y + size, Z, u, v);
-                    tes.addVertexWithUV(X, Y + size, Z + size, u, V);
-                    tes.addVertexWithUV(X + size, Y + size, Z + size, U, V);
-                    tes.addVertexWithUV(X + size, Y + size, Z, U, v);
-                    break;
-                case 2:
-                    tes.addVertexWithUV(X, Y, Z, U, V);
-                    tes.addVertexWithUV(X, Y + size, Z, U, v);
-                    tes.addVertexWithUV(X + size, Y + size, Z, u, v);
-                    tes.addVertexWithUV(X + size, Y, Z, u, V);
-                    break;
-                case 3:
-                    tes.addVertexWithUV(X + size, Y, Z + size, U, V);
-                    tes.addVertexWithUV(X + size, Y + size, Z + size, U, v);
-                    tes.addVertexWithUV(X, Y + size, Z + size, u, v);
-                    tes.addVertexWithUV(X, Y, Z + size, u, V);
-                    break;
-                case 4:
-                    tes.addVertexWithUV(X, Y, Z + size, U, V);
-                    tes.addVertexWithUV(X, Y + size, Z + size, U, v);
-                    tes.addVertexWithUV(X, Y + size, Z, u, v);
-                    tes.addVertexWithUV(X, Y, Z, u, V);
-                    break;
-                case 5:
-                    tes.addVertexWithUV(X + size, Y, Z, U, V);
-                    tes.addVertexWithUV(X + size, Y + size, Z, U, v);
-                    tes.addVertexWithUV(X + size, Y + size, Z + size, u, v);
-                    tes.addVertexWithUV(X + size, Y, Z + size, u, V);
-                    break;
-            }
-        }
-        GL11.glEnable(GL11.GL_CULL_FACE);
-        GL11.glDepthMask(true);
-    }
-
-    @Override
-    public int getFXLayer() {
-        return 1;
-    }
-
-    @Override
-    public boolean shouldRenderInPass(int pass) {
-        return pass==2;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/loader/ConstructableLoader.java b/src/main/java/com/github/technus/tectech/loader/ConstructableLoader.java
deleted file mode 100644
index dc282ec0b6..0000000000
--- a/src/main/java/com/github/technus/tectech/loader/ConstructableLoader.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.github.technus.tectech.loader;
-
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.constructable.IMultiblockInfoContainer;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ElectricBlastFurnace;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-import static com.github.technus.tectech.mechanics.constructable.IMultiblockInfoContainer.registerMetaClass;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.ofBlock;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.ofHint;
-import static gregtech.api.GregTech_API.sBlockCasings1;
-
-public class ConstructableLoader implements Runnable {
-
-    @Override
-    public void run() {
-        registerMetaClass(GT_MetaTileEntity_ElectricBlastFurnace.class, new IMultiblockInfoContainer<GT_MetaTileEntity_ElectricBlastFurnace>() {
-            //region Structure
-            private final IStructureDefinition<GT_MetaTileEntity_ElectricBlastFurnace> definition=
-                    StructureDefinition.<GT_MetaTileEntity_ElectricBlastFurnace>builder()
-                            .addShapeOldApi("main",new String[][]{
-                                    {"000","\"\"\"","\"\"\""," . ",},
-                                    {"0!0","\"A\"","\"A\"","   ",},
-                                    {"000","\"\"\"","\"\"\"","   ",},
-                            })
-                            .addElement('0', ofBlock(sBlockCasings1,11))
-                            .addElement('\"', ofHint(3))
-                            .addElement('!', ofHint(2))
-                            .addElement(' ', ofHint(1))
-                            .build();
-            private final String[] desc=new String[]{
-                    EnumChatFormatting.AQUA+"Hint Details:",
-                    "1 - Classic Hatches or Heat Proof Casing",
-                    "2 - Muffler Hatch",
-                    "3 - Coil blocks"
-            };
-            //endregion
-
-            @Override
-            public void construct(ItemStack stackSize, boolean hintsOnly, GT_MetaTileEntity_ElectricBlastFurnace tileEntity, ExtendedFacing aSide) {
-                IGregTechTileEntity base = tileEntity.getBaseMetaTileEntity();
-                definition.buildOrHints(tileEntity, stackSize, "main", base.getWorld(),
-                        aSide, base.getXCoord(), base.getYCoord(),
-                        base.getZCoord(), 1, 3, 0, hintsOnly);
-            }
-
-            @Override
-            public String[] getDescription(ItemStack stackSize) {
-                return desc;
-            }
-        });
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index b9d737f98a..fd638aba6d 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -125,7 +125,7 @@ public final class MainLoader {
     }
 
     public static void postLoad(EMDefinitionsRegistry registry, EMTransformationRegistry transformationInfo) {
-        ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 6);
+        ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 5);
 
         progressBarPostLoad.step("Dreamcraft Compatibility");
         if(Loader.isModLoaded(Reference.DREAMCRAFT)){
@@ -162,10 +162,6 @@ public final class MainLoader {
             TecTech.LOGGER.info("Blocks were not nerfed");
         }
 
-        progressBarPostLoad.step("Constructable stuff");
-        new ConstructableLoader().run();
-        TecTech.LOGGER.info("Constructable initialized");
-
         ProgressManager.pop(progressBarPostLoad);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
index 1edd924587..8401af51ca 100644
--- a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
+++ b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
@@ -3,10 +3,9 @@ package com.github.technus.tectech.loader;
 import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
 import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import com.github.technus.tectech.mechanics.enderStorage.EnderLinkCoverMessage;
+import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage;
 import com.github.technus.tectech.mechanics.spark.RendererMessage;
-import com.github.technus.tectech.mechanics.alignment.AlignmentMessage;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.TextParametersMessage;
-import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage;
 
 import static com.github.technus.tectech.Reference.MODID;
 
@@ -24,9 +23,6 @@ public class NetworkDispatcher extends eu.usrv.yamcore.network.PacketDispatcher
         registerMessage(PipeActivityMessage.ServerHandler.class, PipeActivityMessage.PipeActivityQuery.class);
         registerMessage(PipeActivityMessage.ClientHandler.class, PipeActivityMessage.PipeActivityData.class);
 
-        registerMessage(AlignmentMessage.ServerHandler.class, AlignmentMessage.AlignmentQuery.class);
-        registerMessage(AlignmentMessage.ClientHandler.class, AlignmentMessage.AlignmentData.class);
-
         registerMessage(ChunkDataMessage.ServerHandler.class, ChunkDataMessage.ChunkDataQuery.class);
         registerMessage(ChunkDataMessage.ClientHandler.class, ChunkDataMessage.ChunkDataData.class);
 
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
index d91d0e5900..c6c71ae630 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/BaseRecipeLoader.java
@@ -8,10 +8,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.transformations
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.thing.CustomItemList;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
 import com.github.technus.tectech.thing.item.EuMeterGT;
-import com.github.technus.tectech.thing.item.FrontRotationTriggerItem;
+import com.gtnewhorizon.structurelib.StructureLibAPI;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.ItemList;
@@ -47,22 +45,12 @@ public class BaseRecipeLoader {
         // ===================================================================================================
 
         for(int i=0;i<=15;i++) {
-            RA.addAssemblerRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(i), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1)}, Materials.Aluminium.getMolten(864), new ItemStack(TT_Container_Casings.sHintCasingsTT, 1, i), 32, 120);
+            RA.addAssemblerRecipe(new ItemStack[]{GT_Utility.getIntegratedCircuit(i),
+                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 1)},
+                    Materials.Aluminium.getMolten(864),
+                    new ItemStack(StructureLibAPI.getBlockHint(), 1, i), 32, 120);
         }
 
-        //Scrench
-        GT_ModHandler.addCraftingRecipe(new ItemStack(FrontRotationTriggerItem.INSTANCE,1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{"fPR", " RP", "S h",
-                        'P', OrePrefixes.plate.get(Materials.Cobalt),
-                        'R', OrePrefixes.stick.get(Materials.Cobalt),
-                        'S', OrePrefixes.stick.get(Materials.Wood),});
-
-        //BLUEprint
-        GT_ModHandler.addShapelessCraftingRecipe(new ItemStack(ConstructableTriggerItem.INSTANCE, 1),
-                GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                new Object[]{Dyes.dyeBlue, OrePrefixes.plate.get(Materials.Paper), Dyes.dyeBlue, Dyes.dyeWhite});
-
         //GT EU reader
         GT_ModHandler.addCraftingRecipe(new ItemStack(EuMeterGT.INSTANCE,1),
                 GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
@@ -95,16 +83,15 @@ public class BaseRecipeLoader {
                         'E', ItemList.Hull_IV});
 
         //Data Bank
-        RA.addAssemblylineRecipe(ItemList.Hatch_DataAccess_EV.get(1), 20000, new ItemStack[]{
+        RA.addAssemblylineRecipe(ItemList.Hatch_DataAccess_EV.get(1), 20000, new Object[]{
                 CustomItemList.Machine_Multi_Switch.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2),
+                new Object[]{OrePrefixes.circuit.get(Materials.Master), 2},
                 ItemList.Tool_DataOrb.get(1),
                 ItemList.Cover_Screen.get(1),
         }, new FluidStack[]{
                 new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000),
                 Materials.Hydrogen.getGas(1000),
         }, CustomItemList.Machine_Multi_DataBank.get(1), 12000, 14000);
-        //CustomItemList.Machine_Multi_DataBank
 
         //Bucks
         //RA.addAssemblerRecipe(CustomItemList.)
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
index 4adeeec315..d144d74618 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
@@ -33,8 +33,6 @@ public class ThingsLoader implements Runnable {
         TecTech.LOGGER.info("Elemental Casing registered");
         TT_Container_Casings.sBlockCasingsBA0 = new GT_Block_CasingsBA0();
         TecTech.LOGGER.info("Nikolai's Casing registered");
-        TT_Container_Casings.sHintCasingsTT = new GT_Block_HintTT();
-        TecTech.LOGGER.info("Hint Blocks registered");
 
         QuantumGlassBlock.run();
         TecTech.LOGGER.info("Quantum Glass registered");
@@ -52,8 +50,6 @@ public class ThingsLoader implements Runnable {
         ReactorSimBlock.run();
         TecTech.LOGGER.info("Reactor Simulator registered");
 
-        ConstructableTriggerItem.run();
-        FrontRotationTriggerItem.run();
         ParametrizerMemoryCard.run();
         ElementalDefinitionScanStorage_EM.run();
         EuMeterGT.run();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentLimits.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentLimits.java
deleted file mode 100644
index 26a6d80dd8..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentLimits.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment;
-
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.Arrays;
-import java.util.Optional;
-import java.util.Random;
-import java.util.function.Function;
-
-import static com.github.technus.tectech.mechanics.alignment.IAlignment.STATES_COUNT;
-
-public class AlignmentLimits implements IAlignmentLimits {
-
-    protected final boolean[] validStates=new boolean[STATES_COUNT];
-
-    public AlignmentLimits() {
-        allowAll();
-    }
-
-    AlignmentLimits allowAll(){
-        Arrays.fill(validStates,true);
-        return this;
-    }
-
-    AlignmentLimits denyAll(){
-        Arrays.fill(validStates,false);
-        return this;
-    }
-
-    AlignmentLimits randomAll(Random random){
-        for (int i = 0; i < validStates.length; i++) {
-            validStates[i]=random.nextBoolean();
-        }
-        return this;
-    }
-
-    AlignmentLimits deny(ExtendedFacing... deny){
-        if(deny!=null){
-            for (ExtendedFacing extendedFacing : deny) {
-                validStates[extendedFacing.getIndex()]=false;
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits allow(ExtendedFacing... allow){
-        if(allow!=null){
-            for (ExtendedFacing extendedFacing : allow) {
-                validStates[extendedFacing.getIndex()]=false;
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits deny(ForgeDirection... deny){
-        if(deny!=null){
-            for (ExtendedFacing value : ExtendedFacing.VALUES) {
-                for (ForgeDirection direction : deny) {
-                    if (value.getDirection() == direction) {
-                        validStates[value.getIndex()] = false;
-                        break;
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits allow(ForgeDirection... allow){
-        if(allow!=null){
-            for (ExtendedFacing value : ExtendedFacing.VALUES) {
-                for (ForgeDirection direction : allow) {
-                    if (value.getDirection() == direction) {
-                        validStates[value.getIndex()] = true;
-                        break;
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits deny(Rotation... deny){
-        if(deny!=null){
-            for (ExtendedFacing value : ExtendedFacing.VALUES) {
-                for (Rotation rotation : deny) {
-                    if (value.getRotation() == rotation) {
-                        validStates[value.getIndex()] = false;
-                        break;
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits allow(Rotation... allow){
-        if(allow!=null){
-            for (ExtendedFacing value : ExtendedFacing.VALUES) {
-                for (Rotation rotation : allow) {
-                    if (value.getRotation() == rotation) {
-                        validStates[value.getIndex()] = true;
-                        break;
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits deny(Flip... deny){
-        if(deny!=null){
-            for (ExtendedFacing value : ExtendedFacing.VALUES) {
-                for (Flip flip : deny) {
-                    if (value.getFlip() == flip) {
-                        validStates[value.getIndex()] = false;
-                        break;
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits allow(Flip... allow){
-        if(allow!=null){
-            for (ExtendedFacing value : ExtendedFacing.VALUES) {
-                for (Flip flip : allow) {
-                    if (value.getFlip() == flip) {
-                        validStates[value.getIndex()] = true;
-                        break;
-                    }
-                }
-            }
-        }
-        return this;
-    }
-
-    AlignmentLimits predicateApply(Function<ExtendedFacing,Optional<Boolean>> predicate){
-        for (ExtendedFacing value : ExtendedFacing.VALUES) {
-            predicate.apply(value).ifPresent(bool->validStates[value.getIndex()]=bool);
-        }
-        return this;
-    }
-
-    AlignmentLimits ensureDuplicates(){
-        for (ExtendedFacing value : ExtendedFacing.VALUES) {
-            if(validStates[value.getIndex()]){
-                validStates[value.getDuplicate().getIndex()]=true;
-            }
-        }
-        return this;
-    }
-
-    /**
-     * Prefers rotation over flip, so both flip will get translated to opposite rotation and no flip
-     * @param flip the preferred flip to be used Horizontal or vertical
-     * @return this
-     */
-    AlignmentLimits ensureNoDuplicates(Flip flip){
-        if(flip==Flip.BOTH||flip==Flip.NONE){
-            throw new IllegalArgumentException("Preffered Flip must be Horizontal or Vertical");
-        }
-        flip=flip.getOpposite();
-        for (ExtendedFacing value : ExtendedFacing.VALUES) {
-            if(validStates[value.getIndex()]){
-                if(value.getFlip()==Flip.BOTH || value.getFlip()==flip){
-                    validStates[value.getIndex()]=false;
-                    validStates[value.getDuplicate().getIndex()]=true;
-                }
-            }
-        }
-        return this;
-    }
-
-    @Override
-    public boolean isNewExtendedFacingValid(ForgeDirection direction, Rotation rotation, Flip flip) {
-        return validStates[IAlignment.getAlignmentIndex(direction,rotation,flip)];
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentMessage.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentMessage.java
deleted file mode 100644
index 07a3e02c1f..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentMessage.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment;
-
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
-import cpw.mods.fml.common.network.ByteBufUtils;
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import eu.usrv.yamcore.network.client.AbstractClientMessageHandler;
-import eu.usrv.yamcore.network.server.AbstractServerMessageHandler;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import io.netty.buffer.ByteBuf;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
-
-public class AlignmentMessage implements IMessage {
-    int mPosX;
-    int mPosY;
-    int mPosZ;
-    int mPosD;
-    int mAlign;
-
-    public AlignmentMessage() {
-    }
-
-    private AlignmentMessage(GT_MetaTileEntity_MultiblockBase_EM metaTile) {
-        IGregTechTileEntity base=metaTile.getBaseMetaTileEntity();
-        mPosX=base.getXCoord();
-        mPosY=base.getYCoord();
-        mPosZ=base.getZCoord();
-        mPosD=base.getWorld().provider.dimensionId;
-        mAlign =metaTile.getExtendedFacing().getIndex();
-    }
-
-    private AlignmentMessage(World world, int x, int y, int z, IAlignment front) {
-        mPosX=x;
-        mPosY=y;
-        mPosZ=z;
-        mPosD=world.provider.dimensionId;
-        mAlign =front.getExtendedFacing().getIndex();
-    }
-
-    @Override
-    public void fromBytes(ByteBuf pBuffer) {
-        NBTTagCompound tTag = ByteBufUtils.readTag(pBuffer);
-        mPosX = tTag.getInteger("posx");
-        mPosY = tTag.getInteger("posy");
-        mPosZ = tTag.getInteger("posz");
-        mPosD = tTag.getInteger("posd");
-        mAlign = tTag.getInteger("rotf");
-    }
-
-    @Override
-    public void toBytes(ByteBuf pBuffer) {
-        NBTTagCompound tFXTag = new NBTTagCompound();
-        tFXTag.setInteger("posx", mPosX);
-        tFXTag.setInteger("posy", mPosY);
-        tFXTag.setInteger("posz", mPosZ);
-        tFXTag.setInteger("posd", mPosD);
-        tFXTag.setInteger("rotf", mAlign);
-
-        ByteBufUtils.writeTag(pBuffer, tFXTag);
-    }
-
-    public static class AlignmentQuery extends AlignmentMessage {
-        public AlignmentQuery() {
-        }
-
-        public AlignmentQuery(GT_MetaTileEntity_MultiblockBase_EM metaTile) {
-            super(metaTile);
-        }
-
-        public AlignmentQuery(World world, int x, int y, int z, IAlignment front) {
-            super(world,x,y,z,front);
-        }
-    }
-
-    public static class AlignmentData extends AlignmentMessage {
-        public AlignmentData() {
-        }
-
-        private AlignmentData(AlignmentQuery query){
-            mPosX=query.mPosX;
-            mPosY=query.mPosY;
-            mPosZ=query.mPosZ;
-            mPosD=query.mPosD;
-            mAlign =query.mAlign;
-        }
-
-        public AlignmentData(GT_MetaTileEntity_MultiblockBase_EM metaTile) {
-            super(metaTile);
-        }
-
-        public AlignmentData(World world, int x, int y, int z, IAlignment front) {
-            super(world,x,y,z,front);
-        }
-    }
-
-    public static class ClientHandler extends AbstractClientMessageHandler<AlignmentData> {
-        @Override
-        public IMessage handleClientMessage(EntityPlayer pPlayer, AlignmentData pMessage, MessageContext pCtx) {
-            if(pPlayer.worldObj.provider.dimensionId==pMessage.mPosD){
-                TileEntity te=pPlayer.worldObj.getTileEntity(pMessage.mPosX,pMessage.mPosY,pMessage.mPosZ);
-                if(te instanceof IGregTechTileEntity){
-                    IMetaTileEntity meta = ((IGregTechTileEntity) te).getMetaTileEntity();
-                    if(meta instanceof IAlignment){
-                        ((IAlignment) meta).setExtendedFacing(ExtendedFacing.byIndex(pMessage.mAlign));
-                    }
-                }else if (te instanceof IAlignment){
-                    ((IAlignment) te).setExtendedFacing(ExtendedFacing.byIndex(pMessage.mAlign));
-                }
-            }
-            return null;
-        }
-    }
-
-    public static class ServerHandler extends AbstractServerMessageHandler<AlignmentQuery> {
-        @Override
-        public IMessage handleServerMessage(EntityPlayer pPlayer, AlignmentQuery pMessage, MessageContext pCtx) {
-            World world= DimensionManager.getWorld(pMessage.mPosD);
-            if(world!=null) {
-                TileEntity te = world.getTileEntity(pMessage.mPosX, pMessage.mPosY, pMessage.mPosZ);
-                if (te instanceof IGregTechTileEntity) {
-                    IMetaTileEntity meta = ((IGregTechTileEntity) te).getMetaTileEntity();
-                    if (meta instanceof IAlignment) {
-                        pMessage.mAlign =((IAlignment) meta).getExtendedFacing().getIndex();
-                        return new AlignmentData(pMessage);
-                    }
-                } else if (te instanceof IAlignment) {
-                    pMessage.mAlign =((IAlignment) te).getExtendedFacing().getIndex();
-                    return new AlignmentData(pMessage);
-                }
-            }
-            return null;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentUtility.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentUtility.java
deleted file mode 100644
index 68e11b77af..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/AlignmentUtility.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment;
-
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.FakePlayer;
-
-public class AlignmentUtility {
-    private AlignmentUtility(){
-
-    }
-
-    public static boolean handle(EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ){
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if(tTileEntity==null || aPlayer instanceof FakePlayer) {
-            return aPlayer instanceof EntityPlayerMP;
-        }
-        if (aPlayer instanceof EntityPlayerMP) {
-            if (tTileEntity instanceof IGregTechTileEntity) {
-                IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-                if (metaTE instanceof IAlignmentProvider) {
-                    IAlignment alignment = ((IAlignmentProvider) metaTE).getAlignment();
-                    if(aPlayer.isSneaking()){
-                        alignment.toolSetFlip(null);
-                    }else {
-                        alignment.toolSetRotation(null);
-                    }
-                    return true;
-                }
-            } else if (tTileEntity instanceof IAlignmentProvider) {
-                IAlignment alignment = ((IAlignmentProvider) tTileEntity).getAlignment();
-                if(aPlayer.isSneaking()){
-                    alignment.toolSetFlip(null);
-                }else {
-                    alignment.toolSetRotation(null);
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignment.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignment.java
deleted file mode 100644
index a2a6301070..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignment.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment;
-
-import com.github.technus.tectech.mechanics.alignment.enumerable.Direction;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.Arrays;
-
-public interface IAlignment extends IAlignmentLimits,IAlignmentProvider {
-    int DIRECTIONS_COUNT= Direction.VALUES.length;
-    int ROTATIONS_COUNT= Rotation.VALUES.length;
-    int FLIPS_COUNT= Flip.VALUES.length;
-    int STATES_COUNT = ExtendedFacing.VALUES.length;
-
-    ExtendedFacing getExtendedFacing();
-
-    void setExtendedFacing(ExtendedFacing alignment);
-
-    IAlignmentLimits getAlignmentLimits();
-
-    void setAlignmentLimits(IAlignmentLimits limits);
-
-    @Override
-    default IAlignment getAlignment(){
-        return this;
-    }
-
-    static int getAlignmentIndex(ForgeDirection direction, Rotation rotation, Flip flip){
-        return (direction.ordinal()*ROTATIONS_COUNT+rotation.getIndex())*FLIPS_COUNT+flip.getIndex();
-    }
-
-    default ForgeDirection getDirection(){
-        return getExtendedFacing().getDirection();
-    }
-
-    default void setDirection(ForgeDirection direction){
-        setExtendedFacing(getExtendedFacing().with(direction));
-    }
-
-    default Rotation getRotation(){
-        return getExtendedFacing().getRotation();
-    }
-
-    default void setRotation(Rotation rotation){
-        setExtendedFacing(getExtendedFacing().with(rotation));
-    }
-
-    default Flip getFlip(){
-        return getExtendedFacing().getFlip();
-    }
-
-    default void setFlip(Flip flip){
-        setExtendedFacing(getExtendedFacing().with(flip));
-    }
-
-    default boolean toolSetDirection(ForgeDirection direction){
-        if(direction==null || direction==ForgeDirection.UNKNOWN){
-            for (int i = 0,j=getDirection().ordinal()+1, valuesLength = Direction.VALUES.length; i < valuesLength; i++) {
-                if(toolSetDirection(Direction.VALUES[j%valuesLength].getForgeDirection())){
-                    return true;
-                }
-            }
-        }else {
-            for (ExtendedFacing extendedFacing : ExtendedFacing.FOR_FACING.get(direction)) {
-                if(checkedSetExtendedFacing(extendedFacing)){
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    default boolean checkedSetDirection(ForgeDirection direction){
-        if (isNewDirectionValid(direction)){
-            setDirection(direction);
-            return true;
-        }
-        return false;
-    }
-
-    default boolean canSetToDirectionAny(ForgeDirection direction){
-        for (ExtendedFacing extendedFacing : ExtendedFacing.FOR_FACING.get(direction)) {
-            if(isNewExtendedFacingValid(extendedFacing)){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    default boolean toolSetRotation(Rotation rotation) {
-        if(rotation==null){
-            int flips = Flip.VALUES.length;
-            int rotations = Rotation.VALUES.length;
-            for (int ii = 0,jj=getFlip().ordinal(); ii < flips; ii++) {
-                for (int i = 0,j=getRotation().ordinal()+1; i < rotations; i++) {
-                    if(checkedSetExtendedFacing(ExtendedFacing.of(getDirection(),Rotation.VALUES[j%rotations],Flip.VALUES[jj%flips]))){
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }else {
-            return checkedSetRotation(rotation);
-        }
-    }
-
-    default boolean checkedSetRotation(Rotation rotation){
-        if (isNewRotationValid(rotation)){
-            setRotation(rotation);
-            return true;
-        }
-        return false;
-    }
-
-    default boolean toolSetFlip(Flip flip){
-        if(flip==null){
-            for (int i = 0,j=getFlip().ordinal()+1, valuesLength = Flip.VALUES.length; i < valuesLength; i++) {
-                if(toolSetFlip(Flip.VALUES[j%valuesLength])){
-                    return true;
-                }
-            }
-            return false;
-        }else {
-            return checkedSetFlip(flip);
-        }
-    }
-
-    default boolean checkedSetFlip(Flip flip){
-        if (isNewFlipValid(flip)){
-            setFlip(flip);
-            return true;
-        }
-        return false;
-    }
-
-    default boolean toolSetExtendedFacing(ExtendedFacing extendedFacing){
-        if(extendedFacing==null){
-            for (int i = 0,j=getExtendedFacing().ordinal()+1, valuesLength = ExtendedFacing.VALUES.length; i < valuesLength; i++) {
-                if(toolSetExtendedFacing(ExtendedFacing.VALUES[j%valuesLength])){
-                    return true;
-                }
-            }
-            return false;
-        }else {
-            return checkedSetExtendedFacing(extendedFacing);
-        }
-    }
-
-    default boolean checkedSetExtendedFacing(ExtendedFacing alignment){
-        if (isNewExtendedFacingValid(alignment)){
-            setExtendedFacing(alignment);
-            return true;
-        }
-        return false;
-    }
-
-    default boolean isNewDirectionValid(ForgeDirection direction) {
-        return isNewExtendedFacingValid(direction,getRotation(),getFlip());
-    }
-
-    default boolean isNewRotationValid(Rotation rotation){
-        return isNewExtendedFacingValid(getDirection(),rotation,getFlip());
-    }
-
-    default boolean isNewFlipValid(Flip flip){
-        return isNewExtendedFacingValid(getDirection(),getRotation(),flip);
-    }
-
-    default boolean isExtendedFacingValid() {
-        return isNewExtendedFacingValid(getDirection(),getRotation(),getFlip());
-    }
-
-    @Override
-    default boolean isNewExtendedFacingValid(ForgeDirection direction, Rotation rotation, Flip flip){
-        return getAlignmentLimits().isNewExtendedFacingValid(direction, rotation, flip);
-    }
-
-    @Override
-    default boolean isNewExtendedFacingValid(ExtendedFacing alignment){
-        return getAlignmentLimits().isNewExtendedFacingValid(
-                alignment.getDirection(),
-                alignment.getRotation(),
-                alignment.getFlip());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentLimits.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentLimits.java
deleted file mode 100644
index 68b4d84dab..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentLimits.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public interface IAlignmentLimits {
-
-    IAlignmentLimits UNLIMITED= (direction, rotation, flip) -> true;
-
-    boolean isNewExtendedFacingValid(ForgeDirection direction, Rotation rotation, Flip flip);
-
-    default boolean isNewExtendedFacingValid(ExtendedFacing alignment){
-        return isNewExtendedFacingValid(
-                alignment.getDirection(),
-                alignment.getRotation(),
-                alignment.getFlip());
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentProvider.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentProvider.java
deleted file mode 100644
index 07dc972aac..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/IAlignmentProvider.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment;
-
-public interface IAlignmentProvider {
-    IAlignment getAlignment();
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/IntegerAxisSwap.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/IntegerAxisSwap.java
deleted file mode 100644
index 1c44164731..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/IntegerAxisSwap.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment;
-
-import com.github.technus.tectech.util.Vec3Impl;
-import net.minecraft.util.Vec3;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import static com.github.technus.tectech.mechanics.alignment.enumerable.Direction.getAxisVector;
-import static java.lang.Math.abs;
-
-public class IntegerAxisSwap {
-    private final Vec3Impl forFirstAxis;
-    private final Vec3Impl forSecondAxis;
-    private final Vec3Impl forThirdAxis;
-
-    public IntegerAxisSwap(ForgeDirection forFirstAxis, ForgeDirection forSecondAxis, ForgeDirection forThirdAxis) {
-        this.forFirstAxis = getAxisVector(forFirstAxis);
-        this.forSecondAxis = getAxisVector(forSecondAxis);
-        this.forThirdAxis = getAxisVector(forThirdAxis);
-        if(abs(this.forFirstAxis.get0())+abs(this.forSecondAxis.get0())+abs(this.forThirdAxis.get0())!=1 ||
-                abs(this.forFirstAxis.get1())+abs(this.forSecondAxis.get1())+abs(this.forThirdAxis.get1())!=1 ||
-                abs(this.forFirstAxis.get2())+abs(this.forSecondAxis.get2())+abs(this.forThirdAxis.get2())!=1){
-            throw new IllegalArgumentException("Axis are overlapping/missing! "+
-                    forFirstAxis.name()+" "+
-                    forSecondAxis.name()+" "+
-                    forThirdAxis.name());
-        }
-    }
-
-    public Vec3Impl translate(Vec3Impl point){
-        return new Vec3Impl(
-                forFirstAxis.get0()*point.get0() +forFirstAxis.get1()*point.get1() +forFirstAxis.get2()*point.get2(),
-                forSecondAxis.get0()*point.get0()+forSecondAxis.get1()*point.get1()+forSecondAxis.get2()*point.get2(),
-                forThirdAxis.get0()*point.get0() +forThirdAxis.get1()*point.get1() +forThirdAxis.get2()*point.get2()
-        );
-    }
-
-    public Vec3Impl inverseTranslate(Vec3Impl point){
-        return new Vec3Impl(
-                forFirstAxis.get0()*point.get0()+forSecondAxis.get0()*point.get1()+forThirdAxis.get0()*point.get2(),
-                forFirstAxis.get1()*point.get0()+forSecondAxis.get1()*point.get1()+forThirdAxis.get1()*point.get2(),
-                forFirstAxis.get2()*point.get0()+forSecondAxis.get2()*point.get1()+forThirdAxis.get2()*point.get2()
-        );
-    }
-
-    public Vec3 translate(Vec3 point){
-        return Vec3.createVectorHelper(
-                forFirstAxis.get0()*point.xCoord +forFirstAxis.get1()*point.yCoord +forFirstAxis.get2()*point.zCoord,
-                forSecondAxis.get0()*point.xCoord+forSecondAxis.get1()*point.yCoord+forSecondAxis.get2()*point.zCoord,
-                forThirdAxis.get0()*point.xCoord +forThirdAxis.get1()*point.yCoord +forThirdAxis.get2()*point.zCoord
-        );
-    }
-
-    public Vec3 inverseTranslate(Vec3 point){
-        return Vec3.createVectorHelper(
-                forFirstAxis.get0()*point.xCoord+forSecondAxis.get0()*point.yCoord+forThirdAxis.get0()*point.zCoord,
-                forFirstAxis.get1()*point.xCoord+forSecondAxis.get1()*point.yCoord+forThirdAxis.get1()*point.zCoord,
-                forFirstAxis.get2()*point.xCoord+forSecondAxis.get2()*point.yCoord+forThirdAxis.get2()*point.zCoord
-        );
-    }
-    
-    public void translate(int[] point,int[] out){
-        out[0]=forFirstAxis.get0()*point[0] +forFirstAxis.get1()*point[1] +forFirstAxis.get2()*point[2];
-        out[1]=forSecondAxis.get0()*point[0]+forSecondAxis.get1()*point[1]+forSecondAxis.get2()*point[2];
-        out[2]=forThirdAxis.get0()*point[0] +forThirdAxis.get1()*point[1] +forThirdAxis.get2()*point[2];
-    }
-
-    public void inverseTranslate(int[] point,int[] out){
-        out[0]=forFirstAxis.get0()*point[0]+forSecondAxis.get0()*point[1]+forThirdAxis.get0()*point[2];
-        out[1]=forFirstAxis.get1()*point[0]+forSecondAxis.get1()*point[1]+forThirdAxis.get1()*point[2];
-        out[2]=forFirstAxis.get2()*point[0]+forSecondAxis.get2()*point[1]+forThirdAxis.get2()*point[2];
-    }
-
-    public void translate(double[] point,double[] out){
-        out[0]=forFirstAxis.get0()*point[0] +forFirstAxis.get1()*point[1] +forFirstAxis.get2()*point[2];
-        out[1]=forSecondAxis.get0()*point[0]+forSecondAxis.get1()*point[1]+forSecondAxis.get2()*point[2];
-        out[2]=forThirdAxis.get0()*point[0] +forThirdAxis.get1()*point[1] +forThirdAxis.get2()*point[2];
-    }
-
-    public void inverseTranslate(double[] point,double[] out){
-        out[0]=forFirstAxis.get0()*point[0]+forSecondAxis.get0()*point[1]+forThirdAxis.get0()*point[2];
-        out[1]=forFirstAxis.get1()*point[0]+forSecondAxis.get1()*point[1]+forThirdAxis.get1()*point[2];
-        out[2]=forFirstAxis.get2()*point[0]+forSecondAxis.get2()*point[1]+forThirdAxis.get2()*point[2];
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Direction.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Direction.java
deleted file mode 100644
index cc3971fedb..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Direction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment.enumerable;
-
-import com.github.technus.tectech.util.Vec3Impl;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public enum Direction {
-    DOWN(ForgeDirection.DOWN),
-    UP(ForgeDirection.UP),
-    NORTH(ForgeDirection.NORTH),
-    SOUTH(ForgeDirection.SOUTH),
-    WEST(ForgeDirection.WEST),
-    EAST(ForgeDirection.EAST);
-
-    private final ForgeDirection forgeDirection;
-    private final Vec3Impl axisVector;
-    public static final Direction[] VALUES=values();
-
-    Direction(ForgeDirection forgeDirection) {
-        this.forgeDirection = forgeDirection;
-        axisVector=new Vec3Impl(forgeDirection.offsetX,forgeDirection.offsetY,forgeDirection.offsetZ);
-    }
-
-    public ForgeDirection getForgeDirection() {
-        return forgeDirection;
-    }
-
-    public Vec3Impl getAxisVector() {
-        return axisVector;
-    }
-
-    public static Vec3Impl getAxisVector(ForgeDirection forgeDirection){
-        return VALUES[forgeDirection.ordinal()].axisVector;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/ExtendedFacing.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/ExtendedFacing.java
deleted file mode 100644
index 5949b432df..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/ExtendedFacing.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment.enumerable;
-
-import com.github.technus.tectech.mechanics.alignment.IAlignment;
-import com.github.technus.tectech.mechanics.alignment.IntegerAxisSwap;
-import com.github.technus.tectech.util.Vec3Impl;
-import net.minecraft.util.Vec3;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import java.util.*;
-
-import static com.github.technus.tectech.mechanics.alignment.IAlignment.FLIPS_COUNT;
-import static com.github.technus.tectech.mechanics.alignment.IAlignment.ROTATIONS_COUNT;
-import static java.lang.Math.abs;
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toMap;
-
-public enum ExtendedFacing {
-    DOWN_NORMAL_NONE("down normal none"),
-    DOWN_NORMAL_HORIZONTAL("down normal horizontal"),
-    DOWN_NORMAL_VERTICAL("down normal vertical"),
-    DOWN_NORMAL_BOTH("down normal both"),
-    DOWN_CLOCKWISE_NONE("down clockwise none"),
-    DOWN_CLOCKWISE_HORIZONTAL("down clockwise horizontal"),
-    DOWN_CLOCKWISE_VERTICAL("down clockwise vertical"),
-    DOWN_CLOCKWISE_BOTH("down clockwise both"),
-    DOWN_UPSIDE_DOWN_NONE("down upside down none"),
-    DOWN_UPSIDE_DOWN_HORIZONTAL("down upside down horizontal"),
-    DOWN_UPSIDE_DOWN_VERTICAL("down upside down vertical"),
-    DOWN_UPSIDE_DOWN_BOTH("down upside down both"),
-    DOWN_COUNTER_CLOCKWISE_NONE("down counter clockwise none"),
-    DOWN_COUNTER_CLOCKWISE_HORIZONTAL("down counter clockwise horizontal"),
-    DOWN_COUNTER_CLOCKWISE_VERTICAL("down counter clockwise vertical"),
-    DOWN_COUNTER_CLOCKWISE_BOTH("down counter clockwise both"),
-    UP_NORMAL_NONE("up normal none"),
-    UP_NORMAL_HORIZONTAL("up normal horizontal"),
-    UP_NORMAL_VERTICAL("up normal vertical"),
-    UP_NORMAL_BOTH("up normal both"),
-    UP_CLOCKWISE_NONE("up clockwise none"),
-    UP_CLOCKWISE_HORIZONTAL("up clockwise horizontal"),
-    UP_CLOCKWISE_VERTICAL("up clockwise vertical"),
-    UP_CLOCKWISE_BOTH("up clockwise both"),
-    UP_UPSIDE_DOWN_NONE("up upside down none"),
-    UP_UPSIDE_DOWN_HORIZONTAL("up upside down horizontal"),
-    UP_UPSIDE_DOWN_VERTICAL("up upside down vertical"),
-    UP_UPSIDE_DOWN_BOTH("up upside down both"),
-    UP_COUNTER_CLOCKWISE_NONE("up counter clockwise none"),
-    UP_COUNTER_CLOCKWISE_HORIZONTAL("up counter clockwise horizontal"),
-    UP_COUNTER_CLOCKWISE_VERTICAL("up counter clockwise vertical"),
-    UP_COUNTER_CLOCKWISE_BOTH("up counter clockwise both"),
-    NORTH_NORMAL_NONE("north normal none"),
-    NORTH_NORMAL_HORIZONTAL("north normal horizontal"),
-    NORTH_NORMAL_VERTICAL("north normal vertical"),
-    NORTH_NORMAL_BOTH("north normal both"),
-    NORTH_CLOCKWISE_NONE("north clockwise none"),
-    NORTH_CLOCKWISE_HORIZONTAL("north clockwise horizontal"),
-    NORTH_CLOCKWISE_VERTICAL("north clockwise vertical"),
-    NORTH_CLOCKWISE_BOTH("north clockwise both"),
-    NORTH_UPSIDE_DOWN_NONE("north upside down none"),
-    NORTH_UPSIDE_DOWN_HORIZONTAL("north upside down horizontal"),
-    NORTH_UPSIDE_DOWN_VERTICAL("north upside down vertical"),
-    NORTH_UPSIDE_DOWN_BOTH("north upside down both"),
-    NORTH_COUNTER_CLOCKWISE_NONE("north counter clockwise none"),
-    NORTH_COUNTER_CLOCKWISE_HORIZONTAL("north counter clockwise horizontal"),
-    NORTH_COUNTER_CLOCKWISE_VERTICAL("north counter clockwise vertical"),
-    NORTH_COUNTER_CLOCKWISE_BOTH("north counter clockwise both"),
-    SOUTH_NORMAL_NONE("south normal none"),
-    SOUTH_NORMAL_HORIZONTAL("south normal horizontal"),
-    SOUTH_NORMAL_VERTICAL("south normal vertical"),
-    SOUTH_NORMAL_BOTH("south normal both"),
-    SOUTH_CLOCKWISE_NONE("south clockwise none"),
-    SOUTH_CLOCKWISE_HORIZONTAL("south clockwise horizontal"),
-    SOUTH_CLOCKWISE_VERTICAL("south clockwise vertical"),
-    SOUTH_CLOCKWISE_BOTH("south clockwise both"),
-    SOUTH_UPSIDE_DOWN_NONE("south upside down none"),
-    SOUTH_UPSIDE_DOWN_HORIZONTAL("south upside down horizontal"),
-    SOUTH_UPSIDE_DOWN_VERTICAL("south upside down vertical"),
-    SOUTH_UPSIDE_DOWN_BOTH("south upside down both"),
-    SOUTH_COUNTER_CLOCKWISE_NONE("south counter clockwise none"),
-    SOUTH_COUNTER_CLOCKWISE_HORIZONTAL("south counter clockwise horizontal"),
-    SOUTH_COUNTER_CLOCKWISE_VERTICAL("south counter clockwise vertical"),
-    SOUTH_COUNTER_CLOCKWISE_BOTH("south counter clockwise both"),
-    WEST_NORMAL_NONE("west normal none"),
-    WEST_NORMAL_HORIZONTAL("west normal horizontal"),
-    WEST_NORMAL_VERTICAL("west normal vertical"),
-    WEST_NORMAL_BOTH("west normal both"),
-    WEST_CLOCKWISE_NONE("west clockwise none"),
-    WEST_CLOCKWISE_HORIZONTAL("west clockwise horizontal"),
-    WEST_CLOCKWISE_VERTICAL("west clockwise vertical"),
-    WEST_CLOCKWISE_BOTH("west clockwise both"),
-    WEST_UPSIDE_DOWN_NONE("west upside down none"),
-    WEST_UPSIDE_DOWN_HORIZONTAL("west upside down horizontal"),
-    WEST_UPSIDE_DOWN_VERTICAL("west upside down vertical"),
-    WEST_UPSIDE_DOWN_BOTH("west upside down both"),
-    WEST_COUNTER_CLOCKWISE_NONE("west counter clockwise none"),
-    WEST_COUNTER_CLOCKWISE_HORIZONTAL("west counter clockwise horizontal"),
-    WEST_COUNTER_CLOCKWISE_VERTICAL("west counter clockwise vertical"),
-    WEST_COUNTER_CLOCKWISE_BOTH("west counter clockwise both"),
-    EAST_NORMAL_NONE("east normal none"),
-    EAST_NORMAL_HORIZONTAL("east normal horizontal"),
-    EAST_NORMAL_VERTICAL("east normal vertical"),
-    EAST_NORMAL_BOTH("east normal both"),
-    EAST_CLOCKWISE_NONE("east clockwise none"),
-    EAST_CLOCKWISE_HORIZONTAL("east clockwise horizontal"),
-    EAST_CLOCKWISE_VERTICAL("east clockwise vertical"),
-    EAST_CLOCKWISE_BOTH("east clockwise both"),
-    EAST_UPSIDE_DOWN_NONE("east upside down none"),
-    EAST_UPSIDE_DOWN_HORIZONTAL("east upside down horizontal"),
-    EAST_UPSIDE_DOWN_VERTICAL("east upside down vertical"),
-    EAST_UPSIDE_DOWN_BOTH("east upside down both"),
-    EAST_COUNTER_CLOCKWISE_NONE("east counter clockwise none"),
-    EAST_COUNTER_CLOCKWISE_HORIZONTAL("east counter clockwise horizontal"),
-    EAST_COUNTER_CLOCKWISE_VERTICAL("east counter clockwise vertical"),
-    EAST_COUNTER_CLOCKWISE_BOTH("east counter clockwise both");
-
-    public static final ExtendedFacing DEFAULT=NORTH_NORMAL_NONE;
-    public static final ExtendedFacing[] VALUES = values();
-    public static final Map<ForgeDirection, List<ExtendedFacing>> FOR_FACING=new HashMap<>();
-    static {
-        stream(values()).forEach(extendedFacing ->
-                FOR_FACING.compute(extendedFacing.direction,((forgeDirection, extendedFacings) -> {
-                    if(extendedFacings==null){
-                        extendedFacings = new ArrayList<>();
-                    }
-                    extendedFacings.add(extendedFacing);
-                    return extendedFacings;
-                })));
-    }
-    private static final Map<String, ExtendedFacing> NAME_LOOKUP = stream(VALUES).collect(toMap(ExtendedFacing::getName2, (extendedFacing) -> extendedFacing));
-
-    private final ForgeDirection direction;
-    private final ForgeDirection a,b,c;
-    private final Rotation rotation;
-    private final Flip flip;
-
-    private final String name;
-    private final IntegerAxisSwap integerAxisSwap;
-
-    ExtendedFacing(String name) {
-        this.name = name;
-        direction= Direction.VALUES[ordinal()/(ROTATIONS_COUNT*FLIPS_COUNT)].getForgeDirection();
-        rotation=Rotation.VALUES[ordinal()/FLIPS_COUNT-direction.ordinal()*ROTATIONS_COUNT];
-        flip=Flip.VALUES[ordinal()%FLIPS_COUNT];
-        ForgeDirection a,b,c;
-        switch (direction){
-            case DOWN:
-                a= ForgeDirection.WEST;
-                b= ForgeDirection.SOUTH;
-                c= ForgeDirection.UP;
-                break;
-            case UP:
-                a= ForgeDirection.EAST;
-                b= ForgeDirection.SOUTH;
-                c= ForgeDirection.DOWN;
-                break;
-            case NORTH:
-                a= ForgeDirection.WEST;
-                b= ForgeDirection.DOWN;
-                c= ForgeDirection.SOUTH;
-                break;
-            case SOUTH:
-                a= ForgeDirection.EAST;
-                b= ForgeDirection.DOWN;
-                c= ForgeDirection.NORTH;
-                break;
-            case WEST:
-                a= ForgeDirection.SOUTH;
-                b= ForgeDirection.DOWN;
-                c= ForgeDirection.EAST;
-                break;
-            case EAST:
-                a= ForgeDirection.NORTH;
-                b= ForgeDirection.DOWN;
-                c= ForgeDirection.WEST;
-                break;
-            default:throw new RuntimeException("Is impossible...");
-        }
-        switch (flip){//This duplicates some axis swaps since flip boolean would do, but seems more convenient to use
-            case HORIZONTAL:
-                a=a.getOpposite();
-                break;
-            case BOTH:
-                a=a.getOpposite();
-            case VERTICAL:
-                b=b.getOpposite();
-                break;
-            case NONE: break;
-            default:throw new RuntimeException("Even more impossible...");
-        }
-        switch (rotation) {
-            case CLOCKWISE: {
-                ForgeDirection _a=a;
-                a =b;
-                b =_a.getOpposite();
-                break;
-            }
-            case UPSIDE_DOWN:
-                a=a.getOpposite();
-                b=b.getOpposite();
-                break;
-            case COUNTER_CLOCKWISE: {
-                ForgeDirection _a=a;
-                a =b.getOpposite();
-                b =_a;
-                break;
-            }
-            case NORMAL: break;
-            default:
-                throw new RuntimeException("More impossible...");
-        }
-        this.a=a;
-        this.b=b;
-        this.c=c;
-        integerAxisSwap =new IntegerAxisSwap(a,b,c);
-    }
-
-    public static ExtendedFacing of(ForgeDirection direction, Rotation rotation, Flip flip){
-        if(direction==ForgeDirection.UNKNOWN){
-            return VALUES[IAlignment.getAlignmentIndex(ForgeDirection.NORTH, rotation, flip)];
-        }
-        return VALUES[IAlignment.getAlignmentIndex(direction, rotation, flip)];
-    }
-
-    public static ExtendedFacing of(ForgeDirection direction){
-        if(direction==ForgeDirection.UNKNOWN){
-            return DEFAULT;
-        }
-        return VALUES[IAlignment.getAlignmentIndex(direction, Rotation.NORMAL, Flip.NONE)];
-    }
-
-    public ExtendedFacing with(ForgeDirection direction){
-        return of(direction,rotation,flip);
-    }
-
-    public ExtendedFacing with(Rotation rotation){
-        return of(direction,rotation,flip);
-    }
-
-    public ExtendedFacing with(Flip flip){
-        return of(direction,rotation,flip);
-    }
-
-    public ExtendedFacing getOppositeDirection() {
-        return of(direction.getOpposite(),rotation,flip);
-    }
-
-    public ExtendedFacing getOppositeRotation() {
-        return of(direction,rotation.getOpposite(),flip);
-    }
-
-    public ExtendedFacing getOppositeFlip() {
-        return of(direction,rotation,flip.getOpposite());
-    }
-
-    /**
-     * Gets the same effective facing achieved by different rot/flip combo
-     * @return same effective facing, but different enum value
-     */
-    public ExtendedFacing getDuplicate(){
-        return of(direction,rotation.getOpposite(),flip.getOpposite());
-    }
-
-    public int getIndex(){
-        return ordinal();
-    }
-
-    public String getName2() {
-        return this.name;
-    }
-
-    public static ExtendedFacing byName(String name) {
-        return name == null ? null : NAME_LOOKUP.get(name.toLowerCase(Locale.ROOT));
-    }
-
-    public static ExtendedFacing byIndex(int index) {
-        return VALUES[abs(index % VALUES.length)];
-    }
-
-    public static ExtendedFacing random(Random rand) {
-        return VALUES[rand.nextInt(VALUES.length)];
-    }
-
-    public ForgeDirection getDirection() {
-        return direction;
-    }
-
-    public Rotation getRotation() {
-        return rotation;
-    }
-
-    public Flip getFlip() {
-        return flip;
-    }
-
-    /**
-     * Translates relative to front facing offset  to  world offset
-     * @param abcOffset A,B,C offset (facing relative  L-->R,U-->D,F-->B)
-     * @return X,Y,Z offset in world
-     */
-    public Vec3 getWorldOffset(Vec3 abcOffset) {
-        return integerAxisSwap.inverseTranslate(abcOffset);
-    }
-    public Vec3Impl getWorldOffset(Vec3Impl abcOffset) {
-        return integerAxisSwap.inverseTranslate(abcOffset);
-    }
-    public void getWorldOffset(int[] point,int[] out){
-        integerAxisSwap.inverseTranslate(point,out);
-    }
-    public void getWorldOffset(double[] point,double[] out){
-        integerAxisSwap.inverseTranslate(point,out);
-    }
-
-
-    /**
-     * Translates world offset  to  relative front facing offset
-     * @param xyzOffset X,Y,Z offset in world
-     * @return A,B,C offset (facing relative  L-->R,U-->D,F-->B)
-     */
-    public Vec3 getOffsetABC(Vec3 xyzOffset){
-        return integerAxisSwap.translate(xyzOffset);
-    }
-    public Vec3Impl getOffsetABC(Vec3Impl xyzOffset){
-        return integerAxisSwap.translate(xyzOffset);
-    }
-    public void getOffsetABC(int[] point,int[] out){
-        integerAxisSwap.translate(point,out);
-    }
-    public void getOffsetABC(double[] point,double[] out){
-        integerAxisSwap.translate(point,out);
-    }
-
-    public IntegerAxisSwap getIntegerAxisSwap() {
-        return integerAxisSwap;
-    }
-
-    public ForgeDirection getRelativeLeftInWorld() {
-        return a;
-    }
-
-    public ForgeDirection getRelativeRightInWorld() {
-        return a.getOpposite();
-    }
-
-    public ForgeDirection getRelativeDownInWorld() {
-        return b;
-    }
-
-    public ForgeDirection getRelativeUpInWorld() {
-        return b.getOpposite();
-    }
-
-    public ForgeDirection getRelativeBackInWorld() {
-        return c;
-    }
-
-    public ForgeDirection getRelativeForwardInWorld() {
-        return c.getOpposite();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Flip.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Flip.java
deleted file mode 100644
index 4b1dff70ec..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Flip.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment.enumerable;
-
-import javax.annotation.Nonnull;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
-
-import static java.lang.Math.abs;
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toMap;
-
-public enum Flip {
-    NONE(3, "none"),
-    HORIZONTAL(2, "horizontal"),
-    VERTICAL(1, "vertical"),
-    BOTH(0, "both");
-
-    private final int opposite;
-    private final String name;
-
-    public static final Flip[] VALUES = values();
-    private static final Map<String, Flip> NAME_LOOKUP = stream(VALUES).collect(toMap(Flip::getName2, (flip) -> flip));
-
-    Flip(int oppositeIn, String nameIn) {
-        this.opposite = oppositeIn;
-        this.name = nameIn;
-    }
-
-    public int getIndex(){
-        return ordinal();
-    }
-
-    public Flip getOpposite() {
-        return VALUES[opposite];
-    }
-
-    public String getName2() {
-        return this.name;
-    }
-
-    public static Flip byName(String name) {
-        return name == null ? null : NAME_LOOKUP.get(name.toLowerCase(Locale.ROOT));
-    }
-
-    public static Flip byIndex(int index) {
-        return VALUES[abs(index % VALUES.length)];
-    }
-
-    public static Flip random(@Nonnull Random rand) {
-        return VALUES[rand.nextInt(VALUES.length)];
-    }
-
-    public String toString() {
-        return this.name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public boolean isNotFlipped(){
-        return this==NONE;
-    }
-
-    public boolean isBothFlipped(){
-        return this==BOTH;
-    }
-
-    public boolean isHorizontallyFlipped() {
-        return this==HORIZONTAL || isBothFlipped();
-    }
-
-    public boolean isVerticallyFliped() {
-        return this==VERTICAL || isBothFlipped();
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Rotation.java b/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Rotation.java
deleted file mode 100644
index 5d41f54a11..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/alignment/enumerable/Rotation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.github.technus.tectech.mechanics.alignment.enumerable;
-
-import javax.annotation.Nonnull;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
-
-import static java.lang.Math.abs;
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.toMap;
-
-public enum Rotation {
-    NORMAL(2, "normal"),
-    CLOCKWISE(3, "clockwise"),
-    UPSIDE_DOWN(0, "upside down"),
-    COUNTER_CLOCKWISE(1, "counter clockwise");
-
-    private final int opposite;
-    private final String name;
-
-    public static final Rotation[] VALUES = values();
-    private static final Map<String, Rotation> NAME_LOOKUP = stream(VALUES).collect(toMap(Rotation::getName2, (rotation) -> rotation));
-
-    Rotation(int oppositeIn, String nameIn) {
-        this.opposite = oppositeIn;
-        this.name = nameIn;
-    }
-
-    public int getIndex(){
-        return ordinal();
-    }
-
-    public Rotation getOpposite() {
-        return VALUES[opposite];
-    }
-
-    public String getName2() {
-        return this.name;
-    }
-
-    public static Rotation byName(String name) {
-        return name == null ? null : NAME_LOOKUP.get(name.toLowerCase(Locale.ROOT));
-    }
-
-    public static Rotation byIndex(int index) {
-        return VALUES[abs(index % VALUES.length)];
-    }
-
-    public static Rotation random(@Nonnull Random rand) {
-        return VALUES[rand.nextInt(VALUES.length)];
-    }
-
-    public String toString() {
-        return this.name;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public boolean isNotRotated(){
-        return this==NORMAL;
-    }
-
-    public boolean isClockwise(){
-        return this==CLOCKWISE;
-    }
-
-    public boolean isCounterClockwise(){
-        return this==COUNTER_CLOCKWISE;
-    }
-
-    public boolean isUpsideDown(){
-        return this==UPSIDE_DOWN;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/constructable/ConstructableUtility.java b/src/main/java/com/github/technus/tectech/mechanics/constructable/ConstructableUtility.java
deleted file mode 100644
index 2dc74330f9..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/constructable/ConstructableUtility.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.github.technus.tectech.mechanics.constructable;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.alignment.IAlignment;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public class ConstructableUtility {
-    private ConstructableUtility(){
-
-    }
-
-    public static boolean handle(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide) {
-        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
-        if(tTileEntity==null || aPlayer instanceof FakePlayer) {
-            return aPlayer instanceof EntityPlayerMP;
-        }
-        if (aPlayer instanceof EntityPlayerMP) {
-            //struct gen
-            if (aPlayer.isSneaking() && aPlayer.capabilities.isCreativeMode) {
-                if (tTileEntity instanceof IGregTechTileEntity) {
-                    IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-                    if (metaTE instanceof IConstructable) {
-                        ((IConstructable) metaTE).construct(aStack, false);
-                    } else if (IMultiblockInfoContainer.contains(metaTE.getClass())) {
-                        IMultiblockInfoContainer<IMetaTileEntity> iMultiblockInfoContainer =IMultiblockInfoContainer.get(metaTE.getClass());
-                        if(metaTE instanceof IAlignment){
-                            iMultiblockInfoContainer.construct(aStack, false, metaTE, (
-                                    (IAlignment) metaTE).getExtendedFacing());
-                        }else {
-                            iMultiblockInfoContainer.construct(aStack, false, metaTE,
-                                    ExtendedFacing.of(ForgeDirection.getOrientation(((IGregTechTileEntity) tTileEntity).getFrontFacing())));
-                        }
-                    }
-                } else if (tTileEntity instanceof IConstructable) {
-                    ((IConstructable) tTileEntity).construct(aStack, false);
-                } else if (IMultiblockInfoContainer.contains(tTileEntity.getClass())) {
-                    IMultiblockInfoContainer<TileEntity> iMultiblockInfoContainer =IMultiblockInfoContainer.get(tTileEntity.getClass());
-                    if(tTileEntity instanceof IAlignment){
-                        iMultiblockInfoContainer.construct(aStack, false, tTileEntity,
-                                ((IAlignment) tTileEntity).getExtendedFacing());
-                    }else {
-                        iMultiblockInfoContainer.construct(aStack, false, tTileEntity,
-                                ExtendedFacing.of(ForgeDirection.getOrientation(aSide)));
-                    }
-                }
-            }
-            return true;
-        }else if (TecTech.proxy.isThePlayer(aPlayer)){//particles and text client side
-            //if ((!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode)) {
-            if(tTileEntity instanceof IGregTechTileEntity) {
-                IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-                if (metaTE instanceof IConstructable) {
-                    ((IConstructable) metaTE).construct(aStack, true);
-                    TecTech.proxy.printInchat(((IConstructable) metaTE).getStructureDescription(aStack));
-                    return false;
-                } else if(IMultiblockInfoContainer.contains(metaTE.getClass())){
-                    IMultiblockInfoContainer<IMetaTileEntity> iMultiblockInfoContainer =IMultiblockInfoContainer.get(metaTE.getClass());
-                    if(metaTE instanceof IAlignment){
-                        iMultiblockInfoContainer.construct(aStack, true, metaTE,
-                                ((IAlignment) metaTE).getExtendedFacing());
-                    }else {
-                        iMultiblockInfoContainer.construct(aStack, true, metaTE,
-                                ExtendedFacing.of(ForgeDirection.getOrientation(((IGregTechTileEntity) tTileEntity).getFrontFacing())));
-                    }
-                    TecTech.proxy.printInchat(IMultiblockInfoContainer.get(metaTE.getClass()).getDescription(aStack));
-                    return false;
-                }
-            } else if(tTileEntity instanceof IConstructable){
-                ((IConstructable) tTileEntity).construct(aStack,true);
-                TecTech.proxy.printInchat(((IConstructable) tTileEntity).getStructureDescription(aStack));
-                return false;
-            } else if(IMultiblockInfoContainer.contains(tTileEntity.getClass())){
-                IMultiblockInfoContainer<TileEntity> iMultiblockInfoContainer = IMultiblockInfoContainer.get(tTileEntity.getClass());
-                if(tTileEntity instanceof IAlignment){
-                    iMultiblockInfoContainer.construct(aStack, true, tTileEntity,
-                            ((IAlignment) tTileEntity).getExtendedFacing());
-                }else {
-                    iMultiblockInfoContainer.construct(aStack, true, tTileEntity,
-                            ExtendedFacing.of(ForgeDirection.getOrientation(aSide)));
-                }
-                TecTech.proxy.printInchat(IMultiblockInfoContainer.get(tTileEntity.getClass()).getDescription(aStack));
-                return false;
-            }
-            //} else {
-            //    if(tTileEntity instanceof IGregTechTileEntity) {
-            //        IMetaTileEntity metaTE = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
-            //        if (metaTE instanceof IConstructable) {
-            //            TecTech.proxy.printInchat(((IConstructable) metaTE).getStructureDescription(aStack.stackSize));
-            //            return false;
-            //        } else if(multiblockMap.containsKey(metaTE.getClass().getCanonicalName())){
-            //            TecTech.proxy.printInchat(multiblockMap.get(metaTE.getClass().getCanonicalName()).getDescription(aStack.stackSize));
-            //            return false;
-            //        }
-            //    } else if(tTileEntity instanceof IConstructable){
-            //        TecTech.proxy.printInchat(((IConstructable) tTileEntity).getStructureDescription(aStack.stackSize));
-            //        return false;
-            //    } else if(multiblockMap.containsKey(tTileEntity.getClass().getCanonicalName())){
-            //        TecTech.proxy.printInchat(multiblockMap.get(tTileEntity.getClass().getCanonicalName()).getDescription(aStack.stackSize));
-            //        return false;
-            //    }
-            //}
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/constructable/IConstructable.java b/src/main/java/com/github/technus/tectech/mechanics/constructable/IConstructable.java
deleted file mode 100644
index 1de0381f1f..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/constructable/IConstructable.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.technus.tectech.mechanics.constructable;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.item.ItemStack;
-
-/**
- * Created by Tec on 24.03.2017.
- */
-public interface IConstructable {
-    void construct(ItemStack stackSize, boolean hintsOnly);
-
-    @SideOnly(Side.CLIENT)
-    String[] getStructureDescription(ItemStack stackSize);
-}
-
diff --git a/src/main/java/com/github/technus/tectech/mechanics/constructable/IMultiblockInfoContainer.java b/src/main/java/com/github/technus/tectech/mechanics/constructable/IMultiblockInfoContainer.java
deleted file mode 100644
index 173e0d16ec..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/constructable/IMultiblockInfoContainer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.github.technus.tectech.mechanics.constructable;
-
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-
-import java.util.HashMap;
-
-/**
- * To implement IConstructable on not own TileEntities
- */
-public interface IMultiblockInfoContainer<T> {
-    HashMap<String, IMultiblockInfoContainer<?>> MULTIBLOCK_MAP = new HashMap<>();
-
-    static <T extends TileEntity> void  registerTileClass(Class<T> clazz, IMultiblockInfoContainer<?> info){
-        MULTIBLOCK_MAP.put(clazz.getCanonicalName(),info);
-    }
-
-    static <T extends IMetaTileEntity> void registerMetaClass(Class<T> clazz, IMultiblockInfoContainer<?> info){
-        MULTIBLOCK_MAP.put(clazz.getCanonicalName(),info);
-    }
-
-    @SuppressWarnings("unchecked")
-    static <T> IMultiblockInfoContainer<T> get(Class<?> tClass){
-        return (IMultiblockInfoContainer<T>)MULTIBLOCK_MAP.get(tClass.getCanonicalName());
-    }
-
-    static boolean contains(Class<?> tClass){
-        return MULTIBLOCK_MAP.containsKey(tClass.getCanonicalName());
-    }
-
-    void construct(ItemStack stackSize, boolean hintsOnly, T tileEntity, ExtendedFacing aSide);
-
-    @SideOnly(Side.CLIENT)
-    String[] getDescription(ItemStack stackSize);
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java
index 990a48ac70..f30105f1ee 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/DataPacket.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.dataTransport;
 
-import com.github.technus.tectech.util.Vec3Impl;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import net.minecraft.nbt.NBTTagCompound;
 
 import java.util.Collections;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java
index 268de6f71c..0fddb53fe9 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/dataTransport/QuantumDataPacket.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.dataTransport;
 
-import com.github.technus.tectech.util.Vec3Impl;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class QuantumDataPacket extends DataPacket<Long> {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java b/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java
index e31e63f250..0480cfffd2 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java
@@ -1,6 +1,7 @@
 package com.github.technus.tectech.mechanics.spark;
 
-import com.github.technus.tectech.util.Vec3Impl;
+
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IBlockPosConsumer.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IBlockPosConsumer.java
deleted file mode 100644
index c3ea2d3e3f..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IBlockPosConsumer.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import net.minecraft.world.World;
-
-public interface IBlockPosConsumer {
-    void consume(World world, int x, int y, int z);
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/ICustomBlockSetting.java b/src/main/java/com/github/technus/tectech/mechanics/structure/ICustomBlockSetting.java
deleted file mode 100644
index b70e76fbac..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/ICustomBlockSetting.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import net.minecraft.block.Block;
-import net.minecraft.world.World;
-
-public interface ICustomBlockSetting {
-    /**
-     * Default block setting calls {@link World#setBlock(int x, int y, int z, Block block, int meta, int updateType)} like:
-     * {@code world.setBlock(x,y,z,this/block,meta,2)} where updateType 2 means to update lighting and stuff
-     * @param world world that should be affected
-     * @param x x position to set
-     * @param y y position to set
-     * @param z z position to set
-     * @param meta required meta
-     */
-    void setBlock(World world, int x, int y, int z, int meta);
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
deleted file mode 100644
index c8488d5cea..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-import java.util.Arrays;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-
-public interface IStructureDefinition<T> {
-    /**
-     * Used internally
-     * @param name same name as for other methods here
-     * @return the array of elements to process
-     */
-    IStructureElement<T>[] getStructureFor(String name);
-
-    default boolean check(T object,String piece, World world, ExtendedFacing extendedFacing,
-                          int basePositionX, int basePositionY, int basePositionZ,
-                          int basePositionA, int basePositionB, int basePositionC,
-                          boolean forceCheckAllBlocks){
-        return iterate(object, null, getStructureFor(piece), world, extendedFacing, basePositionX, basePositionY, basePositionZ,
-                basePositionA, basePositionB, basePositionC,false,forceCheckAllBlocks);
-    }
-
-    default boolean hints(T object, ItemStack trigger,String piece, World world, ExtendedFacing extendedFacing,
-                          int basePositionX, int basePositionY, int basePositionZ,
-                          int basePositionA, int basePositionB, int basePositionC) {
-        return iterate(object, trigger, getStructureFor(piece), world, extendedFacing, basePositionX, basePositionY, basePositionZ,
-                basePositionA, basePositionB, basePositionC,true,null);
-    }
-
-    default boolean build(T object, ItemStack trigger,String piece, World world, ExtendedFacing extendedFacing,
-                          int basePositionX, int basePositionY, int basePositionZ,
-                          int basePositionA, int basePositionB, int basePositionC) {
-        return iterate(object, trigger, getStructureFor(piece), world, extendedFacing, basePositionX, basePositionY, basePositionZ,
-                basePositionA, basePositionB, basePositionC,false,null);
-    }
-
-    default boolean buildOrHints(T object, ItemStack trigger,String piece, World world, ExtendedFacing extendedFacing,
-                                 int basePositionX, int basePositionY, int basePositionZ,
-                                 int basePositionA, int basePositionB, int basePositionC,
-                                 boolean hintsOnly){
-        return iterate(object, trigger, getStructureFor(piece), world, extendedFacing, basePositionX, basePositionY, basePositionZ,
-                basePositionA, basePositionB, basePositionC,hintsOnly,null);
-    }
-
-    static <T> boolean iterate(T object, ItemStack trigger, IStructureElement<T>[] elements, World world, ExtendedFacing extendedFacing,
-                               int basePositionX, int basePositionY, int basePositionZ,
-                               int basePositionA, int basePositionB, int basePositionC,
-                               boolean hintsOnly, Boolean checkBlocksIfNotNullForceCheckAllIfTrue){
-        if(world.isRemote ^ hintsOnly){
-            return false;
-        }
-
-        //change base position to base offset
-        basePositionA=-basePositionA;
-        basePositionB=-basePositionB;
-        basePositionC=-basePositionC;
-
-        int[] abc = new int[]{basePositionA,basePositionB,basePositionC};
-        int[] xyz = new int[3];
-
-        if(checkBlocksIfNotNullForceCheckAllIfTrue!=null){
-            if(checkBlocksIfNotNullForceCheckAllIfTrue){
-                for (IStructureElement<T> element : elements) {
-                    if(element.isNavigating()) {
-                        abc[0] = (element.resetA() ? basePositionA : abc[0]) + element.getStepA();
-                        abc[1] = (element.resetB() ? basePositionB : abc[1]) + element.getStepB();
-                        abc[2] = (element.resetC() ? basePositionC : abc[2]) + element.getStepC();
-                    }else {
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        xyz[0] += basePositionX;
-                        xyz[1] += basePositionY;
-                        xyz[2] += basePositionZ;
-
-                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
-                            if(!element.check(object, world, xyz[0], xyz[1], xyz[2])){
-                                if(DEBUG_MODE){
-                                    TecTech.LOGGER.info("Multi ["+basePositionX+", "+basePositionY+", "+basePositionZ+"] failed @ "+
-                                            Arrays.toString(xyz)+" "+Arrays.toString(abc));
-                                }
-                                return false;
-                            }
-                        } else {
-                            if(DEBUG_MODE){
-                                TecTech.LOGGER.info("Multi ["+basePositionX+", "+basePositionY+", "+basePositionZ+"] !blockExists @ "+
-                                        Arrays.toString(xyz)+" "+Arrays.toString(abc));
-                            }
-                            return false;
-                        }
-                        abc[0]+=1;
-                    }
-                }
-            } else {
-                for (IStructureElement<T> element : elements) {
-                    if(element.isNavigating()) {
-                        abc[0] = (element.resetA() ? basePositionA : abc[0]) + element.getStepA();
-                        abc[1] = (element.resetB() ? basePositionB : abc[1]) + element.getStepB();
-                        abc[2] = (element.resetC() ? basePositionC : abc[2]) + element.getStepC();
-                    }else {
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        xyz[0] += basePositionX;
-                        xyz[1] += basePositionY;
-                        xyz[2] += basePositionZ;
-
-                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
-                            if(!element.check(object, world, xyz[0], xyz[1], xyz[2])){
-                                if(DEBUG_MODE){
-                                    TecTech.LOGGER.info("Multi ["+basePositionX+", "+basePositionY+", "+basePositionZ+"] failed @ "+
-                                            Arrays.toString(xyz)+" "+Arrays.toString(abc));
-                                }
-                                return false;
-                            }
-                        } else {
-                            if(DEBUG_MODE){
-                                TecTech.LOGGER.info("Multi ["+basePositionX+", "+basePositionY+", "+basePositionZ+"] !blockExists @ "+
-                                        Arrays.toString(xyz)+" "+Arrays.toString(abc));
-                            }
-                        }
-                        abc[0]+=1;
-                    }
-                }
-            }
-        }else {
-            if(hintsOnly) {
-                for (IStructureElement<T> element : elements) {
-                    if(element.isNavigating()) {
-                        abc[0] = (element.resetA() ? basePositionA : abc[0]) + element.getStepA();
-                        abc[1] = (element.resetB() ? basePositionB : abc[1]) + element.getStepB();
-                        abc[2] = (element.resetC() ? basePositionC : abc[2]) + element.getStepC();
-                    }else {
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        xyz[0] += basePositionX;
-                        xyz[1] += basePositionY;
-                        xyz[2] += basePositionZ;
-
-                        element.spawnHint(object, world, xyz[0], xyz[1], xyz[2], trigger);
-
-                        abc[0]+=1;
-                    }
-                }
-            } else {
-                for (IStructureElement<T> element : elements) {
-                    if(element.isNavigating()) {
-                        abc[0] = (element.resetA() ? basePositionA : abc[0]) + element.getStepA();
-                        abc[1] = (element.resetB() ? basePositionB : abc[1]) + element.getStepB();
-                        abc[2] = (element.resetC() ? basePositionC : abc[2]) + element.getStepC();
-                    }else {
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        xyz[0] += basePositionX;
-                        xyz[1] += basePositionY;
-                        xyz[2] += basePositionZ;
-
-                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {
-                            element.placeBlock(object, world, xyz[0], xyz[1], xyz[2], trigger);
-                        }
-                        abc[0]+=1;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java
deleted file mode 100644
index f946e71f91..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * Use StructureUtility to instantiate
- */
-public interface IStructureElement<T> {
-    boolean check(T t,World world,int x,int y,int z);
-
-    boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger);
-
-    boolean placeBlock(T t,World world,int x,int y,int z, ItemStack trigger);
-
-    default int getStepA(){
-        return 1;
-    }
-
-    default int getStepB(){
-        return 0;
-    }
-
-    default int getStepC(){
-        return 0;
-    }
-
-    default boolean resetA(){
-        return false;
-    }
-
-    default boolean resetB(){
-        return false;
-    }
-
-    default boolean resetC(){
-        return false;
-    }
-
-    default boolean isNavigating(){
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java
deleted file mode 100644
index f9593ee1c5..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * Use StructureUtility to instantiate
- */
-public interface IStructureElementChain<T> extends IStructureElement<T> {
-    IStructureElement<T>[] fallbacks();
-
-    @Override
-    default boolean check(T t, World world, int x, int y, int z){
-        for (IStructureElement<T> fallback : fallbacks()) {
-            if (fallback.check(t, world, x, y, z)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-        for (IStructureElement<T> fallback : fallbacks()) {
-            if (fallback.spawnHint(t, world, x, y, z, trigger)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-        for (IStructureElement<T> fallback : fallbacks()) {
-            if (fallback.placeBlock(t, world, x, y, z, trigger)) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java
deleted file mode 100644
index ec15aea53b..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public interface IStructureElementCheckOnly<T> extends IStructureElement<T> {
-    @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger){
-        return false;
-    }
-
-    @Override
-    default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger){
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java
deleted file mode 100644
index dbb74312a8..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-/**
- * Use StructureUtility to instantiate
- */
-public interface IStructureElementDeferred<T> extends IStructureElement<T> {
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java
deleted file mode 100644
index 47e6060878..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-public interface IStructureElementNoPlacement<T> extends IStructureElement<T> {
-    @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger){
-        return false;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java
deleted file mode 100644
index d3f4134cea..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-
-/**
- * Use StructureUtility to instantiate
- */
-interface IStructureNavigate<T> extends IStructureElement<T> {
-    @Override
-    default boolean check(T t, World world, int x, int y, int z){
-        return true;
-    }
-
-    @Override
-    default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-        return true;
-    }
-
-    @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-        return true;
-    }
-
-    default boolean isNavigating(){
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java b/src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java
deleted file mode 100644
index 83951372a2..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/Structure.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.init.Blocks;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-
-@Deprecated
-public class Structure {
-    private Structure() {
-    }
-
-    @Deprecated
-    @SafeVarargs
-    public static <T> IHatchAdder<T>[] adders(IHatchAdder<T>... iHatchAdder) {
-        return iHatchAdder;
-    }
-
-    //Check Machine Structure based on string[][] (effectively char[][][]), ond offset of the controller
-    //This only checks for REGULAR BLOCKS!
-    @Deprecated
-    public static <T extends IMetaTileEntity> boolean checker(
-            String[][] structure,//0-9 casing, +- air no air, A... ignore 'A'-CHAR-1 blocks
-            Block[] blockType,//use numbers 0-9 for casing types
-            byte[] blockMeta,//use numbers 0-9 for casing types
-            IHatchAdder<T>[] addingMethods,
-            short[] casingTextures,
-            Block[] blockTypeFallback,//use numbers 0-9 for casing types
-            byte[] blockMetaFallback,//use numbers 0-9 for casing types
-            int horizontalOffset, int verticalOffset, int depthOffset,
-            T metaTile,
-            ExtendedFacing extendedFacing,
-            boolean forceCheck) {
-        IGregTechTileEntity aBaseMetaTileEntity = metaTile.getBaseMetaTileEntity();
-        World world = aBaseMetaTileEntity.getWorld();
-        if (world.isRemote) {
-            return false;
-        }
-        //TE Rotation
-        if (extendedFacing == null) {
-            extendedFacing = ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing()));
-        }
-
-        IGregTechTileEntity igt;
-
-        int[] xyz = new int[3];
-        int[] abc = new int[3];
-        int pointer;
-        int baseX = aBaseMetaTileEntity.getXCoord(),
-                baseZ = aBaseMetaTileEntity.getZCoord(),
-                baseY = aBaseMetaTileEntity.getYCoord();
-        //a,b,c - relative to block face!
-        //x,y,z - relative to block position on map!
-        //yPos  - absolute height of checked block
-
-        //perform your duties
-        abc[2] = -depthOffset;
-        for (String[] _structure : structure) {//front to back
-            abc[1] = -verticalOffset;
-            for (String __structure : _structure) {//top to bottom
-                abc[0] = -horizontalOffset;
-                for (char block : __structure.toCharArray()) {//left to right
-                    if (block < ' ') {
-                        //Control chars allow skipping
-                        abc[1] += block;
-                        break;
-                    } else if (block > '@') {
-                        //characters allow to skip check A-1 skip, B-2 skips etc.
-                        abc[0] += block - '@';
-                    }//else if (block < '+')//used to mark THINGS
-                    //    a++;
-                    else if (block == '.') {
-                        abc[0]++;
-                    } else {
-                        //get x y z from rotation
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        xyz[0] += baseX;
-                        xyz[1] += baseY;
-                        xyz[2] += baseZ;
-
-                        //that must be here since in some cases other axis (b,c) controls y
-                        if (xyz[1] < 0 || xyz[1] >= 256) {
-                            return false;
-                        }
-
-                        //Check block
-                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {//this actually checks if the chunk is loaded at this pos
-                            switch (block) {
-                                case '-'://must be air
-                                    if (world.getBlock(xyz[0], xyz[1], xyz[2]).getMaterial() != Material.air) {
-                                        return false;
-                                    }
-                                    break;
-                                case '+'://must not be air
-                                    if (world.getBlock(xyz[0], xyz[1], xyz[2]).getMaterial() == Material.air) {
-                                        return false;
-                                    }
-                                    break;
-                                default://check for block (countable)
-                                    Block worldblock = world.getBlock(xyz[0], xyz[1], xyz[2]);
-                                    int dmg = worldblock.getDamageValue(world, xyz[0], xyz[1], xyz[2]);
-                                    if ((pointer = block - '0') >= 0) {
-                                        //countable air -> net.minecraft.block.BlockAir
-                                        if (worldblock != blockType[pointer]) {
-                                            if (DEBUG_MODE) {
-                                                TecTech.LOGGER.info("Struct-block-error " + xyz[0] + ' ' + xyz[1] + ' ' + xyz[2] + " / " + abc[0] + ' ' + abc[1] + ' ' + abc[2] + " / " + worldblock.getUnlocalizedName() + ' ' + blockType[pointer].getUnlocalizedName());
-                                            }
-                                            return false;
-                                        }
-                                        if (dmg != blockMeta[pointer]) {
-                                            if (DEBUG_MODE) {
-                                                TecTech.LOGGER.info("Struct-meta-id-error " + xyz[0] + ' ' + xyz[1] + ' ' + xyz[2] + " / " + abc[0] + ' ' + abc[1] + ' ' + abc[2] + " / " + dmg + ' ' + blockMeta[pointer]);
-                                            }
-                                            return false;
-                                        }
-                                    } else if ((pointer = block - ' ') >= 0) {
-                                        igt = aBaseMetaTileEntity.getIGregTechTileEntity(xyz[0], xyz[1], xyz[2]);
-                                        if (igt == null || !addingMethods[pointer].apply(metaTile, igt, casingTextures[pointer])) {
-                                            if (worldblock != blockTypeFallback[pointer]) {
-                                                if (DEBUG_MODE) {
-                                                    TecTech.LOGGER.info("Fallback-struct-block-error " + xyz[0] + ' ' + xyz[1] + ' ' + xyz[2] + " / " + abc[0] + ' ' + abc[1] + ' ' + abc[2] + " / " + worldblock.getUnlocalizedName() + ' ' + (blockTypeFallback[pointer] == null ? "null" : blockTypeFallback[pointer].getUnlocalizedName()));
-                                                }
-                                                return false;
-                                            }
-                                            if (dmg != blockMetaFallback[pointer]) {
-                                                if (DEBUG_MODE) {
-                                                    TecTech.LOGGER.info("Fallback-Struct-meta-id-error " + xyz[0] + ' ' + xyz[1] + ' ' + xyz[2] + " / " + abc[0] + ' ' + abc[1] + ' ' + abc[2] + " / " + dmg + ' ' + blockMetaFallback[pointer]);
-                                                }
-                                                return false;
-                                            }
-                                        }
-                                    }
-                            }
-                        } else if (forceCheck) {
-                            return false;
-                        }
-                        abc[0]++;//block in horizontal layer
-                    }
-                }
-                abc[1]++;//horizontal layer
-            }
-            abc[2]++;//depth
-        }
-        return true;
-    }
-
-    @Deprecated
-    public static boolean builder(String[][] structure,//0-9 casing, +- air no air, A... ignore 'A'-CHAR+1 blocks
-                                  Block[] blockType,//use numbers 0-9 for casing types
-                                  byte[] blockMeta,//use numbers 0-9 for casing types
-                                  int horizontalOffset, int verticalOffset, int depthOffset,
-                                  IGregTechTileEntity tileEntity, ExtendedFacing extendedFacing, boolean hintsOnly) {
-        World world = tileEntity.getWorld();
-        int baseX = tileEntity.getXCoord();
-        int baseY = tileEntity.getYCoord();
-        int baseZ = tileEntity.getZCoord();
-        if (world == null || (!world.isRemote && hintsOnly)) {
-            return false;
-        }
-
-        //TE Rotation
-        int[] xyz = new int[3];
-        int[] abc = new int[3];
-        int pointer;
-
-        //a,b,c - relative to block face!
-        //x,y,z - relative to block position on map!
-
-        //perform your duties
-        abc[2] = -depthOffset;
-        for (String[] _structure : structure) {//front to back
-            abc[1] = -verticalOffset;
-            for (String __structure : _structure) {//top to bottom
-                abc[0] = -horizontalOffset;
-                for (char block : __structure.toCharArray()) {//left to right
-                    if (block < ' ') {//Control chars allow skipping
-                        abc[1] += block;
-                        break;
-                    }
-                    if (block > '@')//characters allow to skip check a-1 skip, b-2 skips etc.
-                    {
-                        abc[0] += block - '@';
-                    }//else if (block < '+')//used to mark THINGS
-                    //    a++;
-                    else if (block == '.')// this TE
-                    {
-                        abc[0]++;
-                    } else {
-                        //get x y z from rotation
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        xyz[0] += baseX;
-                        xyz[1] += baseY;
-                        xyz[2] += baseZ;
-
-                        //that must be here since in some cases other axis (b,c) controls y
-                        if (xyz[1] < 0 || xyz[1] >= 256) {
-                            return false;
-                        }
-
-                        //Check block
-                        if (world.blockExists(xyz[0], xyz[1], xyz[2])) {//this actually checks if the chunk is loaded
-                            if (hintsOnly) {
-                                switch (block) {
-                                    case '-'://must be air
-                                        TecTech.proxy.hint_particle(world, xyz[0], xyz[1], xyz[2], TT_Container_Casings.sHintCasingsTT, 13);
-                                        break;
-                                    case '+'://must not be air
-                                        TecTech.proxy.hint_particle(world, xyz[0], xyz[1], xyz[2], TT_Container_Casings.sHintCasingsTT, 14);
-                                        break;
-                                    default: //check for block
-                                        if ((pointer = block - '0') >= 0) {
-                                            if (world.getBlock(xyz[0], xyz[1], xyz[2]) != blockType[pointer] || blockType[pointer].getDamageValue(world, xyz[0], xyz[1], xyz[2]) != blockMeta[pointer]) {
-                                                TecTech.proxy.hint_particle(world, xyz[0], xyz[1], xyz[2], blockType[pointer], blockMeta[pointer]);
-                                            }
-                                        } else if ((pointer = block - ' ') >= 0) {
-                                            if (pointer < 12) {
-                                                TecTech.proxy.hint_particle(world, xyz[0], xyz[1], xyz[2], TT_Container_Casings.sHintCasingsTT, pointer);
-                                            } else {
-                                                TecTech.proxy.hint_particle(world, xyz[0], xyz[1], xyz[2], TT_Container_Casings.sHintCasingsTT, 12);
-                                            }
-                                        } else {
-                                            TecTech.proxy.hint_particle(world, xyz[0], xyz[1], xyz[2], TT_Container_Casings.sHintCasingsTT, 15);
-                                        }
-                                }
-                            } else {
-                                switch (block) {
-                                    case '-'://must be air
-                                        world.setBlock(xyz[0], xyz[1], xyz[2], Blocks.air, 0, 2);
-                                        break;
-                                    case '+'://must not be air
-                                        world.setBlock(xyz[0], xyz[1], xyz[2], TT_Container_Casings.sBlockCasingsTT, 14, 2);
-                                        break;
-                                    default: //check for block
-                                        if ((pointer = block - '0') >= 0) {
-                                            if (blockType[pointer] instanceof ICustomBlockSetting) {
-                                                ((ICustomBlockSetting) blockType[pointer]).setBlock(world, xyz[0], xyz[1], xyz[2], blockMeta[pointer]);
-                                            } else {
-                                                world.setBlock(xyz[0], xyz[1], xyz[2], blockType[pointer], blockMeta[pointer], 2);
-                                            }
-                                        }
-                                }
-                            }
-                        }
-                        abc[0]++;//block in horizontal layer
-                    }
-                }
-                abc[1]++;//horizontal layer
-            }
-            abc[2]++;//depth
-        }
-        return true;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java
deleted file mode 100644
index 9a1e94d98a..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import com.github.technus.tectech.util.Vec3Impl;
-
-import java.util.*;
-
-import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
-
-public class StructureDefinition<T> implements IStructureDefinition<T> {
-    private final Map<Character, IStructureElement<T>> elements;
-    private final Map<String, String> shapes;
-    private final Map<String, IStructureElement<T>[]> structures;
-
-    public static <B> Builder<B> builder() {
-        return new Builder<>();
-    }
-
-    private StructureDefinition(
-            Map<Character, IStructureElement<T>> elements,
-            Map<String, String> shapes,
-            Map<String, IStructureElement<T>[]> structures) {
-        this.elements =elements;
-        this.shapes=shapes;
-        this.structures = structures;
-    }
-
-    public static class Builder<T> {
-        private static final char A='\uA000';
-        private static final char B='\uB000';
-        private static final char C='\uC000';
-        private char d ='\uD000';
-        private final Map<Vec3Impl,Character> navigates;
-        private final Map<Character, IStructureElement<T>> elements;
-        private final Map<String, String> shapes;
-
-        private Builder() {
-            navigates=new HashMap<>();
-            elements = new HashMap<>();
-            shapes = new HashMap<>();
-        }
-
-        public Map<Character, IStructureElement<T>> getElements() {
-            return elements;
-        }
-
-        public Map<String, String> getShapes() {
-            return shapes;
-        }
-
-        /**
-         * Casings go: 0 1 2 3 4 5 6 7 8 9 : ; < = > ?
-         * <br/>
-         * HatchAdders go: space ! " # $ % & ' ( ) *
-         * @param name
-         * @param structurePiece
-         * @return
-         */
-        @Deprecated
-        public Builder<T> addShapeOldApi(String name, String[][] structurePiece) {
-            StringBuilder builder = new StringBuilder();
-            if (structurePiece.length > 0) {
-                for (String[] strings : structurePiece) {
-                    if (strings.length > 0) {
-                        for (String string : strings) {
-                            for (int i = 0; i < string.length(); i++) {
-                                char ch = string.charAt(i);
-                                if(ch<' '){
-                                    for (int b = 0; b < ch; b++) {
-                                        builder.append(B);
-                                    }
-                                }else if(ch>'@'){
-                                    for (int a = '@'; a < ch; a++) {
-                                        builder.append(A);
-                                    }
-                                }else if(ch=='.'){
-                                    builder.append(A);
-                                }else{
-                                    builder.append(ch);
-                                }
-                            }
-                            builder.append(B);
-                        }
-                        builder.setLength(builder.length() - 1);
-                    }
-                    builder.append(C);
-                }
-                builder.setLength(builder.length() - 1);
-            }
-            int a=0,b=0,c=0;
-            for (int i = 0; i < builder.length(); i++) {
-                char ch = builder.charAt(i);
-                if(ch==A){
-                    a++;
-                }else if(ch==B){
-                    a=0;
-                    b++;
-                }else if(ch==C){
-                    a=0;
-                    b=0;
-                    c++;
-                }else if(a!=0 || b!=0 || c!=0){
-                    Vec3Impl vec3 = new Vec3Impl(a, b, c);
-                    Character navigate = navigates.get(vec3);
-                    if(navigate==null){
-                        navigate= d++;
-                        navigates.put(vec3,navigate);
-                        addElement(navigate,step(vec3));
-                    }
-                    builder.setCharAt(i-1,navigate);
-                    a=0;
-                    b=0;
-                    c=0;
-                }
-            }
-
-            String built = builder.toString().replaceAll("[\\uA000\\uB000\\uC000]","");
-
-            if(built.contains("+")){
-                addElement('+',notAir());
-            }
-            if (built.contains("-")) {
-                addElement('-', isAir());
-            }
-            shapes.put(name, built);
-            return this;
-        }
-
-        /**
-         * Adds shape
-         * +- is air/no air checks
-         * space bar is skip
-         * ~ is also skip (but marks controller position, optional and logically it is a space...)
-         * rest needs to be defined
-         *
-         * next char is next block(a)
-         * next string is next line(b)
-         * next string[] is next slice(c)
-         *
-         * char A000-FFFF range is reserved for generated skips
-         * @param name unlocalized/code name
-         * @param structurePiece generated or written struct - DO NOT STORE IT ANYWHERE, or at least set them to null afterwards
-         * @return this builder
-         */
-        public Builder<T> addShape(String name, String[][] structurePiece) {
-            StringBuilder builder = new StringBuilder();
-            if (structurePiece.length > 0) {
-                for (String[] strings : structurePiece) {
-                    if (strings.length > 0) {
-                        for (String string : strings) {
-                            builder.append(string).append(B);
-                        }
-                        builder.setLength(builder.length() - 1);
-                    }
-                    builder.append(C);
-                }
-                builder.setLength(builder.length() - 1);
-            }
-            int a=0,b=0,c=0;
-            for (int i = 0; i < builder.length(); i++) {
-                char ch = builder.charAt(i);
-                if(ch ==' ' || ch =='~'){
-                    builder.setCharAt(i,A);
-                    ch=A;
-                }
-                if(ch==A){
-                    a++;
-                }else if(ch==B){
-                    a=0;
-                    b++;
-                }else if(ch==C){
-                    a=0;
-                    b=0;
-                    c++;
-                }else if(a!=0 || b!=0 || c!=0){
-                    Vec3Impl vec3 = new Vec3Impl(a, b, c);
-                    Character navigate = navigates.get(vec3);
-                    if(navigate==null){
-                        navigate=d++;
-                        navigates.put(vec3,navigate);
-                        addElement(navigate,step(vec3));
-                    }
-                    builder.setCharAt(i-1,navigate);
-                    a=0;
-                    b=0;
-                    c=0;
-                }
-            }
-
-            String built = builder.toString().replaceAll("[\\uA000\\uB000\\uC000]","");
-
-            if(built.contains("+")){
-                addElement('+',notAir());
-            }
-            if (built.contains("-")) {
-                addElement('-', isAir());
-            }
-            shapes.put(name, built);
-            return this;
-        }
-
-        public Builder<T> addElement(Character name, IStructureElement<T> structurePiece) {
-            elements.putIfAbsent(name, structurePiece);
-            return this;
-        }
-
-        public IStructureDefinition<T> build() {
-            Map<String, IStructureElement<T>[]> structures = compileStructureMap();
-            if(DEBUG_MODE){
-                return new StructureDefinition<>(new HashMap<>(elements), new HashMap<>(shapes), structures);
-            }else {
-                return structures::get;
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        private Map<String, IStructureElement<T>[]> compileElementSetMap() {
-            Set<Integer> missing = new HashSet<>();
-            shapes.values().stream().map(CharSequence::chars).forEach(intStream -> intStream.forEach(c -> {
-                IStructureElement<T> iStructureElement = elements.get((char) c);
-                if (iStructureElement == null) {
-                    missing.add(c);
-                }
-            }));
-            if (missing.isEmpty()) {
-                Map<String, IStructureElement<T>[]> map = new HashMap<>();
-                shapes.forEach((key, value) -> {
-                    Set<Character> chars=new HashSet<>();
-                    for (char c : value.toCharArray()) {
-                        chars.add(c);
-                    }
-                    IStructureElement<T>[] compiled = new IStructureElement[chars.size()];
-                    int i=0;
-                    for (Character aChar : chars) {
-                        compiled[i++]=elements.get(aChar);
-                    }
-                    map.put(key, compiled);
-                });
-                return map;
-            } else {
-                throw new RuntimeException("Missing Structure Element bindings for (chars as integers): " +
-                        Arrays.toString(missing.toArray()));
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        private Map<String, IStructureElement<T>[]> compileStructureMap() {
-            Set<Integer> mising = new HashSet<>();
-            shapes.values().stream().map(CharSequence::chars).forEach(intStream -> intStream.forEach(c -> {
-                IStructureElement<T> iStructureElement = elements.get((char) c);
-                if (iStructureElement == null) {
-                    mising.add(c);
-                }
-            }));
-            if (mising.isEmpty()) {
-                Map<String, IStructureElement<T>[]> map = new HashMap<>();
-                shapes.forEach((key, value) -> {
-                    IStructureElement<T>[] compiled = new IStructureElement[value.length()];
-                    for (int i = 0; i < value.length(); i++) {
-                        compiled[i] = elements.get(value.charAt(i));
-                    }
-                    map.put(key, compiled);
-                });
-                return map;
-            } else {
-                throw new RuntimeException("Missing Structure Element bindings for (chars as integers): " +
-                        Arrays.toString(mising.toArray()));
-            }
-        }
-    }
-
-    public Map<Character, IStructureElement<T>> getElements(){
-        return elements;
-    }
-
-    public Map<String, String> getShapes() {
-        return shapes;
-    }
-
-    public Map<String, IStructureElement<T>[]> getStructures() {
-        return structures;
-    }
-
-    @Override
-    public IStructureElement<T>[] getStructureFor(String name) {
-        return structures.get(name);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java b/src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java
deleted file mode 100644
index 521b0e7645..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureUtility.java
+++ /dev/null
@@ -1,1395 +0,0 @@
-package com.github.technus.tectech.mechanics.structure;
-
-import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.structure.adders.IBlockAdder;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.adders.ITileAdder;
-import com.github.technus.tectech.util.Vec3Impl;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.World;
-
-import java.util.*;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sHintCasingsTT;
-import static java.lang.Integer.MIN_VALUE;
-
-/**
- * Fluent API for structure checking!
- *
- * (Just import static this class to have a nice fluent syntax while defining structure definitions)
- */
-public class StructureUtility {
-    private static final String NICE_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz=|!@#$%&()[]{};:<>/?_,.*^'`";
-    @SuppressWarnings("rawtypes")
-    private static final Map<Vec3Impl, IStructureNavigate> STEP = new HashMap<>();
-    @SuppressWarnings("rawtypes")
-    private static final IStructureElement AIR = new IStructureElement() {
-        @Override
-        public boolean check(Object t, World world, int x, int y, int z) {
-            return world.getBlock(x, y, z).getMaterial() == Material.air;
-        }
-
-        @Override
-        public boolean spawnHint(Object o, World world, int x, int y, int z, ItemStack trigger) {
-            TecTech.proxy.hint_particle(world, x, y, z, sHintCasingsTT, 13);
-            return true;
-        }
-
-        @Override
-        public boolean placeBlock(Object o, World world, int x, int y, int z, ItemStack trigger) {
-            world.setBlock(x, y, z, Blocks.air, 0, 2);
-            return false;
-        }
-    };
-    @SuppressWarnings("rawtypes")
-    private static final IStructureElement NOT_AIR = new IStructureElement() {
-        @Override
-        public boolean check(Object t, World world, int x, int y, int z) {
-            return world.getBlock(x, y, z).getMaterial() != Material.air;
-        }
-
-        @Override
-        public boolean spawnHint(Object o, World world, int x, int y, int z, ItemStack trigger) {
-            TecTech.proxy.hint_particle(world, x, y, z, sHintCasingsTT, 14);
-            return true;
-        }
-
-        @Override
-        public boolean placeBlock(Object o, World world, int x, int y, int z, ItemStack trigger) {
-            world.setBlock(x, y, z, sHintCasingsTT, 14, 2);
-            return true;
-        }
-    };
-    @SuppressWarnings("rawtypes")
-    private static final IStructureElement ERROR = new IStructureElement() {
-        @Override
-        public boolean check(Object t, World world, int x, int y, int z) {
-            return false;
-        }
-
-        @Override
-        public boolean spawnHint(Object o, World world, int x, int y, int z, ItemStack trigger) {
-            TecTech.proxy.hint_particle(world, x, y, z, sHintCasingsTT, 15);
-            return true;
-        }
-
-        @Override
-        public boolean placeBlock(Object o, World world, int x, int y, int z, ItemStack trigger) {
-            return true;
-        }
-    };
-
-    private StructureUtility() {
-
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureElement<T> isAir() {
-        return AIR;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureElement<T> notAir() {
-        return NOT_AIR;
-    }
-
-    /**
-     * Check returns false.
-     * Placement is always handled by this and does nothing.
-     * Makes little to no use it in  fallback chain.
-     *
-     * @param <T>
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureElement<T> error() {
-        return ERROR;
-    }
-
-    //region hint only
-
-    /**
-     * Check always returns: true.
-     *
-     * @param dots
-     * @param <T>
-     * @return
-     */
-    public static <T> IStructureElementNoPlacement<T> ofHint(int dots) {
-        int meta = dots - 1;
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return true;
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, sHintCasingsTT, meta);
-                return false;
-            }
-        };
-    }
-
-    /**
-     * Check always returns: true.
-     *
-     * @param icons
-     * @param <T>
-     * @return
-     */
-    public static <T> IStructureElementNoPlacement<T> ofHintDeferred(Supplier<IIcon[]> icons) {
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return true;
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, icons.get());
-                return false;
-            }
-        };
-    }
-
-    /**
-     * Check always returns: true.
-     *
-     * @param icons
-     * @param RGBa
-     * @param <T>
-     * @return
-     */
-    public static <T> IStructureElementNoPlacement<T> ofHintDeferred(Supplier<IIcon[]> icons, short[] RGBa) {
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return true;
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle_tinted(world, x, y, z, icons.get(), RGBa);
-                return false;
-            }
-        };
-    }
-
-    //endregion
-
-    //region block
-
-    /**
-     * Does not allow Block duplicates (with different meta)
-     */
-    public static <T> IStructureElementNoPlacement<T> ofBlocksFlatHint(Map<Block, Integer> blocsMap, Block hintBlock, int hintMeta) {
-        if (blocsMap == null || blocsMap.isEmpty() || hintBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                Block worldBlock = world.getBlock(x, y, z);
-                return blocsMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                return true;
-            }
-        };
-    }
-
-    /**
-     * Allows block duplicates (with different meta)
-     */
-    public static <T> IStructureElementNoPlacement<T> ofBlocksMapHint(Map<Block, Collection<Integer>> blocsMap, Block hintBlock, int hintMeta) {
-        if (blocsMap == null || blocsMap.isEmpty() || hintBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        for (Collection<Integer> value : blocsMap.values()) {
-            if (value.isEmpty()) {
-                throw new IllegalArgumentException();
-            }
-        }
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                Block worldBlock = world.getBlock(x, y, z);
-                return blocsMap.getOrDefault(worldBlock, Collections.emptySet()).contains(worldBlock.getDamageValue(world, x, y, z));
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                return true;
-            }
-        };
-    }
-
-    public static <T> IStructureElementNoPlacement<T> ofBlockHint(Block block, int meta, Block hintBlock, int hintMeta) {
-        if (block == null || hintBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                Block worldBlock = world.getBlock(x, y, z);
-                return block == worldBlock && meta == worldBlock.getDamageValue(world, x, y, z);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                return true;
-            }
-        };
-    }
-
-    public static <T> IStructureElementNoPlacement<T> ofBlockHint(Block block, int meta) {
-        return ofBlockHint(block, meta, block, meta);
-    }
-
-    public static <T> IStructureElementNoPlacement<T> ofBlockAdderHint(IBlockAdder<T> iBlockAdder, Block hintBlock, int hintMeta) {
-        if (iBlockAdder == null || hintBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                Block worldBlock = world.getBlock(x, y, z);
-                return iBlockAdder.apply(t, worldBlock, worldBlock.getDamageValue(world, x, y, z));
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                return true;
-            }
-        };
-    }
-
-    /**
-     * Does not allow Block duplicates (with different meta)
-     */
-    public static <T> IStructureElement<T> ofBlocksFlat(Map<Block, Integer> blocsMap, Block defaultBlock, int defaultMeta) {
-        if (blocsMap == null || blocsMap.isEmpty() || defaultBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        if(defaultBlock instanceof ICustomBlockSetting){
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return blocsMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z);
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }else {
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return blocsMap.getOrDefault(worldBlock, MIN_VALUE) == worldBlock.getDamageValue(world, x, y, z);
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    world.setBlock(x, y, z, defaultBlock, defaultMeta, 2);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }
-    }
-
-    /**
-     * Allows block duplicates (with different meta)
-     */
-    public static <T> IStructureElement<T> ofBlocksMap(Map<Block, Collection<Integer>> blocsMap, Block defaultBlock, int defaultMeta) {
-        if (blocsMap == null || blocsMap.isEmpty() || defaultBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        for (Collection<Integer> value : blocsMap.values()) {
-            if (value.isEmpty()) {
-                throw new IllegalArgumentException();
-            }
-        }
-        if(defaultBlock instanceof ICustomBlockSetting){
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return blocsMap.getOrDefault(worldBlock, Collections.emptySet()).contains(worldBlock.getDamageValue(world, x, y, z));
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }else {
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return blocsMap.getOrDefault(worldBlock, Collections.emptySet()).contains(worldBlock.getDamageValue(world, x, y, z));
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    world.setBlock(x, y, z, defaultBlock, defaultMeta, 2);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }
-    }
-
-    public static <T> IStructureElement<T> ofBlock(Block block, int meta, Block defaultBlock, int defaultMeta) {
-        if (block == null || defaultBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        if(block instanceof ICustomBlockSetting){
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return block == worldBlock && meta == worldBlock.getDamageValue(world, x, y, z);
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        } else {
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return block == worldBlock && meta == worldBlock.getDamageValue(world, x, y, z);
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    world.setBlock(x, y, z, defaultBlock, defaultMeta, 2);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }
-    }
-
-    /**
-     * Same as above but ignores target meta id
-     */
-    public static <T> IStructureElement<T> ofBlockAnyMeta(Block block, Block defaultBlock, int defaultMeta) {
-        if (block == null || defaultBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        if(block instanceof ICustomBlockSetting){
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    return block == world.getBlock(x, y, z);
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        } else {
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    return block == world.getBlock(x, y, z);
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    world.setBlock(x, y, z, defaultBlock, defaultMeta, 2);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }
-    }
-
-    public static <T> IStructureElement<T> ofBlock(Block block, int meta) {
-        return ofBlock(block, meta, block, meta);
-    }
-
-    /**
-     * Same as above but ignores target meta id
-     */
-    public static <T> IStructureElement<T> ofBlockAnyMeta(Block block) {
-        return ofBlockAnyMeta(block,  block, 0);
-    }
-
-    /**
-     * Same as above but allows to set hint particle render
-     */
-    public static <T> IStructureElement<T> ofBlockAnyMeta(Block block,int defaultMeta) {
-        return ofBlockAnyMeta(block,  block, defaultMeta);
-    }
-
-    //endregion
-
-    //region adders
-
-    public static <T> IStructureElement<T> ofBlockAdder(IBlockAdder<T> iBlockAdder, Block defaultBlock, int defaultMeta) {
-        if (iBlockAdder == null || defaultBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        if(defaultBlock instanceof  ICustomBlockSetting){
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return iBlockAdder.apply(t, worldBlock, worldBlock.getDamageValue(world, x, y, z));
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    ((ICustomBlockSetting) defaultBlock).setBlock(world, x, y, z, defaultMeta);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }else {
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return iBlockAdder.apply(t, worldBlock, worldBlock.getDamageValue(world, x, y, z));
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    world.setBlock(x, y, z, defaultBlock, defaultMeta, 2);
-                    return true;
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, defaultBlock, defaultMeta);
-                    return true;
-                }
-            };
-        }
-    }
-
-    public static <T> IStructureElement<T> ofBlockAdder(IBlockAdder<T> iBlockAdder, int dots) {
-        return ofBlockAdder(iBlockAdder, sHintCasingsTT, dots - 1);
-    }
-
-    public static <T> IStructureElementNoPlacement<T> ofTileAdder(ITileAdder<T> iTileAdder, Block hintBlock, int hintMeta) {
-        if (iTileAdder == null || hintBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                TileEntity tileEntity = world.getTileEntity(x, y, z);
-                return tileEntity instanceof IGregTechTileEntity && iTileAdder.apply(t, tileEntity);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                return true;
-            }
-        };
-    }
-
-    public static <T> IStructureElementNoPlacement<T> ofHatchAdder(IHatchAdder<T> iHatchAdder, int textureIndex, int dots) {
-        return ofHatchAdder(iHatchAdder, textureIndex, sHintCasingsTT, dots - 1);
-    }
-
-    public static <T> IStructureElementNoPlacement<T> ofHatchAdder(IHatchAdder<T> iHatchAdder, int textureIndex, Block hintBlock, int hintMeta) {
-        if (iHatchAdder == null || hintBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementNoPlacement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                TileEntity tileEntity = world.getTileEntity(x, y, z);
-                return tileEntity instanceof IGregTechTileEntity && iHatchAdder.apply(t, (IGregTechTileEntity) tileEntity, (short) textureIndex);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                return true;
-            }
-        };
-    }
-
-    public static <T> IStructureElement<T> ofHatchAdderOptional(IHatchAdder<T> iHatchAdder, int textureIndex, int dots, Block placeCasing, int placeCasingMeta) {
-        return ofHatchAdderOptional(iHatchAdder, textureIndex, sHintCasingsTT, dots - 1, placeCasing, placeCasingMeta);
-    }
-
-    public static <T> IStructureElement<T> ofHatchAdderOptional(IHatchAdder<T> iHatchAdder, int textureIndex, Block hintBlock, int hintMeta, Block placeCasing, int placeCasingMeta) {
-        if (iHatchAdder == null || hintBlock == null) {
-            throw new IllegalArgumentException();
-        }
-        if(placeCasing instanceof ICustomBlockSetting){
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    TileEntity tileEntity = world.getTileEntity(x, y, z);
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return (tileEntity instanceof IGregTechTileEntity &&
-                            iHatchAdder.apply(t, (IGregTechTileEntity) tileEntity, (short) textureIndex)) ||
-                            (worldBlock == placeCasing && worldBlock.getDamageValue(world, x, y, z) == placeCasingMeta);
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                    return true;
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    ((ICustomBlockSetting) placeCasing).setBlock(world, x, y, z, placeCasingMeta);
-                    return true;
-                }
-            };
-        }else {
-            return new IStructureElement<T>() {
-                @Override
-                public boolean check(T t, World world, int x, int y, int z) {
-                    TileEntity tileEntity = world.getTileEntity(x, y, z);
-                    Block worldBlock = world.getBlock(x, y, z);
-                    return (tileEntity instanceof IGregTechTileEntity &&
-                            iHatchAdder.apply(t, (IGregTechTileEntity) tileEntity, (short) textureIndex)) ||
-                            (worldBlock == placeCasing && worldBlock.getDamageValue(world, x, y, z) == placeCasingMeta);
-                }
-
-                @Override
-                public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    TecTech.proxy.hint_particle(world, x, y, z, hintBlock, hintMeta);
-                    return true;
-                }
-
-                @Override
-                public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                    world.setBlock(x, y, z, placeCasing, placeCasingMeta, 2);
-                    return true;
-                }
-            };
-        }
-    }
-
-    //endregion
-
-    //region side effects
-
-    public static <B extends IStructureElement<T>, T> IStructureElement<T> onElementPass(Consumer<T> onCheckPass, B element) {
-        return new IStructureElement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                boolean check = element.check(t, world, x, y, z);
-                if (check) {
-                    onCheckPass.accept(t);
-                }
-                return check;
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return element.placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return element.spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <B extends IStructureElement<T>, T> IStructureElement<T> onElementFail(Consumer<T> onFail, B element) {
-        return new IStructureElement<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                boolean check = element.check(t, world, x, y, z);
-                if (!check) {
-                    onFail.accept(t);
-                }
-                return check;
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return element.placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return element.spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    //endregion
-
-    /**
-     * Take care while chaining, as it will try to call every structure element until it returns true.
-     * If none does it will finally return false.
-     *
-     * @param elementChain
-     * @param <T>
-     * @return
-     */
-    @SafeVarargs
-    public static <T> IStructureElementChain<T> ofChain(IStructureElement<T>... elementChain) {
-        if (elementChain == null || elementChain.length == 0) {
-            throw new IllegalArgumentException();
-        }
-        for (IStructureElement<T> iStructureElement : elementChain) {
-            if (iStructureElement == null) {
-                throw new IllegalArgumentException();
-            }
-        }
-        return () -> elementChain;
-    }
-
-    /**
-     * Take care while chaining, as it will try to call every structure element until it returns true.
-     * If none does it will finally return false.
-     *
-     * @param elementChain
-     * @param <T>
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureElementChain<T> ofChain(List<IStructureElement<T>> elementChain) {
-        return ofChain(elementChain.toArray(new IStructureElement[0]));
-    }
-
-    //region defer
-
-    public static <T> IStructureElementDeferred<T> defer(Supplier<IStructureElement<T>> to) {
-        if (to == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return to.get().check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.get().placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.get().spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <T> IStructureElementDeferred<T> defer(Function<T, IStructureElement<T>> to) {
-        if (to == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return to.apply(t).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.apply(t).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.apply(t).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <T, K> IStructureElementDeferred<T> defer(Function<T, K> keyExtractor, Map<K, IStructureElement<T>> map) {
-        if (keyExtractor == null || map == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return map.get(keyExtractor.apply(t)).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.get(keyExtractor.apply(t)).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.get(keyExtractor.apply(t)).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <T, K> IStructureElementDeferred<T> defer(Function<T, K> keyExtractor, Map<K, IStructureElement<T>> map, IStructureElement<T> defaultElem) {
-        if (keyExtractor == null || map == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return map.getOrDefault(keyExtractor.apply(t), defaultElem).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.getOrDefault(keyExtractor.apply(t), defaultElem).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.getOrDefault(keyExtractor.apply(t), defaultElem).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    @SafeVarargs
-    public static <T> IStructureElementDeferred<T> defer(Function<T, Integer> keyExtractor, IStructureElement<T>... array) {
-        if (keyExtractor == null || array == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return array[keyExtractor.apply(t)].check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return array[keyExtractor.apply(t)].placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return array[keyExtractor.apply(t)].spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureElementDeferred<T> defer(Function<T, Integer> keyExtractor, List<IStructureElement<T>> array) {
-        return defer(keyExtractor, array.toArray(new IStructureElement[0]));
-    }
-
-    public static <T> IStructureElementDeferred<T> defer(BiFunction<T, ItemStack, IStructureElement<T>> to) {
-        if (to == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return to.apply(t, null).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.apply(t, trigger).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.apply(t, trigger).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <T, K> IStructureElementDeferred<T> defer(BiFunction<T, ItemStack, K> keyExtractor, Map<K, IStructureElement<T>> map) {
-        if (keyExtractor == null || map == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return map.get(keyExtractor.apply(t, null)).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.get(keyExtractor.apply(t, trigger)).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.get(keyExtractor.apply(t, trigger)).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <T, K> IStructureElementDeferred<T> defer(BiFunction<T, ItemStack, K> keyExtractor, Map<K, IStructureElement<T>> map, IStructureElement<T> defaultElem) {
-        if (keyExtractor == null || map == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return map.getOrDefault(keyExtractor.apply(t, null), defaultElem).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.getOrDefault(keyExtractor.apply(t, trigger), defaultElem).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.getOrDefault(keyExtractor.apply(t, trigger), defaultElem).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    @SafeVarargs
-    public static <T> IStructureElementDeferred<T> defer(BiFunction<T, ItemStack, Integer> keyExtractor, IStructureElement<T>... array) {
-        if (keyExtractor == null || array == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return array[keyExtractor.apply(t, null)].check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return array[keyExtractor.apply(t, trigger)].placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return array[keyExtractor.apply(t, trigger)].spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureElementDeferred<T> defer(BiFunction<T, ItemStack, Integer> keyExtractor, List<IStructureElement<T>> array) {
-        return defer(keyExtractor, array.toArray(new IStructureElement[0]));
-    }
-
-    public static <T> IStructureElementDeferred<T> defer(Function<T, IStructureElement<T>> toCheck, BiFunction<T, ItemStack, IStructureElement<T>> to) {
-        if (to == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return toCheck.apply(t).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.apply(t, trigger).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return to.apply(t, trigger).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <T, K> IStructureElementDeferred<T> defer(Function<T, K> keyExtractorCheck, BiFunction<T, ItemStack, K> keyExtractor, Map<K, IStructureElement<T>> map) {
-        if (keyExtractor == null || map == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return map.get(keyExtractorCheck.apply(t)).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.get(keyExtractor.apply(t, trigger)).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.get(keyExtractor.apply(t, trigger)).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    public static <T, K> IStructureElementDeferred<T> defer(Function<T, K> keyExtractorCheck, BiFunction<T, ItemStack, K> keyExtractor, Map<K, IStructureElement<T>> map, IStructureElement<T> defaultElem) {
-        if (keyExtractor == null || map == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return map.getOrDefault(keyExtractorCheck.apply(t), defaultElem).check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.getOrDefault(keyExtractor.apply(t, trigger), defaultElem).placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return map.getOrDefault(keyExtractor.apply(t, trigger), defaultElem).spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    @SafeVarargs
-    public static <T> IStructureElementDeferred<T> defer(Function<T, Integer> keyExtractorCheck, BiFunction<T, ItemStack, Integer> keyExtractor, IStructureElement<T>... array) {
-        if (keyExtractor == null || array == null) {
-            throw new IllegalArgumentException();
-        }
-        return new IStructureElementDeferred<T>() {
-            @Override
-            public boolean check(T t, World world, int x, int y, int z) {
-                return array[keyExtractorCheck.apply(t)].check(t, world, x, y, z);
-            }
-
-            @Override
-            public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return array[keyExtractor.apply(t, trigger)].placeBlock(t, world, x, y, z, trigger);
-            }
-
-            @Override
-            public boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-                return array[keyExtractor.apply(t, trigger)].spawnHint(t, world, x, y, z, trigger);
-            }
-        };
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureElementDeferred<T> defer(Function<T, Integer> keyExtractorCheck, BiFunction<T, ItemStack, Integer> keyExtractor, List<IStructureElement<T>> array) {
-        return defer(keyExtractorCheck, keyExtractor, array.toArray(new IStructureElement[0]));
-    }
-
-    //endregion
-
-    /**
-     * Used internally, to generate skips for structure definitions
-     *
-     * @param a
-     * @param b
-     * @param c
-     * @param <T>
-     * @return
-     */
-    public static <T> IStructureNavigate<T> step(int a, int b, int c) {
-        return step(new Vec3Impl(a, b, c));
-    }
-
-    /**
-     * Used internally, to generate skips for structure definitions
-     *
-     * @param step
-     * @param <T>
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> IStructureNavigate<T> step(Vec3Impl step) {
-        if (step == null || step.get0() < 0 || step.get1() < 0 || step.get2() < 0) {
-            throw new IllegalArgumentException();
-        }
-        return STEP.computeIfAbsent(step, vec3 -> {
-            if (vec3.get2() > 0) {
-                return stepC(vec3.get0(), vec3.get1(), vec3.get2());
-            } else if (vec3.get1() > 0) {
-                return stepB(vec3.get0(), vec3.get1(), vec3.get2());
-            } else {
-                return stepA(vec3.get0(), vec3.get1(), vec3.get2());
-            }
-        });
-    }
-
-    private static <T> IStructureNavigate<T> stepA(int a, int b, int c) {
-        return new IStructureNavigate<T>() {
-            @Override
-            public int getStepA() {
-                return a;
-            }
-
-            @Override
-            public int getStepB() {
-                return b;
-            }
-
-            @Override
-            public int getStepC() {
-                return c;
-            }
-        };
-    }
-
-    private static <T> IStructureNavigate<T> stepB(int a, int b, int c) {
-        return new IStructureNavigate<T>() {
-            @Override
-            public int getStepA() {
-                return a;
-            }
-
-            @Override
-            public int getStepB() {
-                return b;
-            }
-
-            @Override
-            public int getStepC() {
-                return c;
-            }
-
-            @Override
-            public boolean resetA() {
-                return true;
-            }
-        };
-    }
-
-    private static <T> IStructureNavigate<T> stepC(int a, int b, int c) {
-        return new IStructureNavigate<T>() {
-            @Override
-            public int getStepA() {
-                return a;
-            }
-
-            @Override
-            public int getStepB() {
-                return b;
-            }
-
-            @Override
-            public int getStepC() {
-                return c;
-            }
-
-            @Override
-            public boolean resetA() {
-                return true;
-            }
-
-            @Override
-            public boolean resetB() {
-                return true;
-            }
-        };
-    }
-
-    /**
-     * Used only to get pseudo code in structure writer...
-     *
-     * @param world
-     * @return
-     */
-    public static String getPseudoJavaCode(World world, ExtendedFacing extendedFacing,
-                                           int basePositionX, int basePositionY, int basePositionZ,
-                                           int basePositionA, int basePositionB, int basePositionC,
-                                           int sizeA, int sizeB, int sizeC, boolean transpose) {
-        Map<Block, Set<Integer>> blocks = new TreeMap<>(Comparator.comparing(Block::getUnlocalizedName));
-        Set<Class<? extends TileEntity>> tiles = new TreeSet<>(Comparator.comparing(Class::getCanonicalName));
-        Set<Class<? extends IMetaTileEntity>> gtTiles = new TreeSet<>(Comparator.comparing(Class::getCanonicalName));
-        iterate(world, extendedFacing, basePositionX, basePositionY, basePositionZ,
-                basePositionA, basePositionB, basePositionC,
-                sizeA, sizeB, sizeC, ((w, x, y, z) -> {
-                    TileEntity tileEntity = w.getTileEntity(x, y, z);
-                    if (tileEntity == null) {
-                        Block block = w.getBlock(x, y, z);
-                        if (block != null && block != Blocks.air) {
-                            blocks.compute(block, (b, set) -> {
-                                if (set == null) {
-                                    set = new TreeSet<>();
-                                }
-                                set.add(block.getDamageValue(world, x, y, z));
-                                return set;
-                            });
-                        }
-                    } else {
-                        if (tileEntity instanceof IGregTechTileEntity) {
-                            IMetaTileEntity meta = ((IGregTechTileEntity) tileEntity).getMetaTileEntity();
-                            if (meta != null) {
-                                gtTiles.add(meta.getClass());
-                            } else {
-                                tiles.add(tileEntity.getClass());
-                            }
-                        } else {
-                            tiles.add(tileEntity.getClass());
-                        }
-                    }
-                }));
-        Map<String, Character> map = new HashMap<>();
-        StringBuilder builder = new StringBuilder();
-        {
-            int i = 0;
-            char c;
-            builder.append("\n\nStructure:\n")
-                    .append("\nBlocks:\n");
-            for (Map.Entry<Block, Set<Integer>> entry : blocks.entrySet()) {
-                Block block = entry.getKey();
-                Set<Integer> set = entry.getValue();
-                for (Integer meta : set) {
-                    c = NICE_CHARS.charAt(i++);
-                    if (i > NICE_CHARS.length()) {
-                        return "Too complicated for nice chars";
-                    }
-                    map.put(block.getUnlocalizedName() + '\0' + meta, c);
-                    builder.append(c).append(" -> ofBlock...(")
-                            .append(block.getUnlocalizedName()).append(", ").append(meta).append(", ...);\n");
-                }
-            }
-            builder.append("\nTiles:\n");
-            for (Class<? extends TileEntity> tile : tiles) {
-                c = NICE_CHARS.charAt(i++);
-                if (i > NICE_CHARS.length()) {
-                    return "Too complicated for nice chars";
-                }
-                map.put(tile.getCanonicalName(), c);
-                builder.append(c).append(" -> ofTileAdder(")
-                        .append(tile.getCanonicalName()).append(", ...);\n");
-            }
-            builder.append("\nMeta:\n");
-            for (Class<? extends IMetaTileEntity> gtTile : gtTiles) {
-                c = NICE_CHARS.charAt(i++);
-                if (i > NICE_CHARS.length()) {
-                    return "Too complicated for nice chars";
-                }
-                map.put(gtTile.getCanonicalName(), c);
-                builder.append(c).append(" -> ofHatchAdder(")
-                        .append(gtTile.getCanonicalName()).append(", textureId, ...);\n");
-            }
-        }
-        builder.append("\nOffsets:\n")
-                .append(basePositionA).append(' ').append(basePositionB).append(' ').append(basePositionC).append('\n');
-        if (transpose) {
-            builder.append("\nTransposed Scan:\n")
-                    .append("new String[][]{\n")
-                    .append("    {\"");
-            iterate(world, extendedFacing, basePositionX, basePositionY, basePositionZ,
-                    basePositionA, basePositionB, basePositionC, true,
-                    sizeA, sizeB, sizeC, ((w, x, y, z) -> {
-                        TileEntity tileEntity = w.getTileEntity(x, y, z);
-                        if (tileEntity == null) {
-                            Block block = w.getBlock(x, y, z);
-                            if (block != null && block != Blocks.air) {
-                                builder.append(map.get(block.getUnlocalizedName() + '\0' + block.getDamageValue(world, x, y, z)));
-                            } else {
-                                builder.append(' ');
-                            }
-                        } else {
-                            if (tileEntity instanceof IGregTechTileEntity) {
-                                IMetaTileEntity meta = ((IGregTechTileEntity) tileEntity).getMetaTileEntity();
-                                if (meta != null) {
-                                    builder.append(map.get(meta.getClass().getCanonicalName()));
-                                } else {
-                                    builder.append(map.get(tileEntity.getClass().getCanonicalName()));
-                                }
-                            } else {
-                                builder.append(map.get(tileEntity.getClass().getCanonicalName()));
-                            }
-                        }
-                    }),
-                    () -> builder.append("\",\""),
-                    () -> {
-                        builder.setLength(builder.length() - 2);
-                        builder.append("},\n    {\"");
-                    });
-            builder.setLength(builder.length() - 8);
-            builder.append("\n}\n\n");
-        } else {
-            builder.append("\nNormal Scan:\n")
-                    .append("new String[][]{{\n")
-                    .append("    \"");
-            iterate(world, extendedFacing, basePositionX, basePositionY, basePositionZ,
-                    basePositionA, basePositionB, basePositionC, false,
-                    sizeA, sizeB, sizeC, ((w, x, y, z) -> {
-                        TileEntity tileEntity = w.getTileEntity(x, y, z);
-                        if (tileEntity == null) {
-                            Block block = w.getBlock(x, y, z);
-                            if (block != null && block != Blocks.air) {
-                                builder.append(map.get(block.getUnlocalizedName() + '\0' + block.getDamageValue(world, x, y, z)));
-                            } else {
-                                builder.append(' ');
-                            }
-                        } else {
-                            if (tileEntity instanceof IGregTechTileEntity) {
-                                IMetaTileEntity meta = ((IGregTechTileEntity) tileEntity).getMetaTileEntity();
-                                if (meta != null) {
-                                    builder.append(map.get(meta.getClass().getCanonicalName()));
-                                } else {
-                                    builder.append(map.get(tileEntity.getClass().getCanonicalName()));
-                                }
-                            } else {
-                                builder.append(map.get(tileEntity.getClass().getCanonicalName()));
-                            }
-                        }
-                    }),
-                    () -> builder.append("\",\n").append("    \""),
-                    () -> {
-                        builder.setLength(builder.length() - 7);
-                        builder.append("\n").append("},{\n").append("    \"");
-                    });
-            builder.setLength(builder.length() - 8);
-            builder.append("}\n\n");
-        }
-        return (builder.toString().replaceAll("\"\"", "E"));
-    }
-
-    public static void iterate(World world, ExtendedFacing extendedFacing,
-                               int basePositionX, int basePositionY, int basePositionZ,
-                               int basePositionA, int basePositionB, int basePositionC,
-                               int sizeA, int sizeB, int sizeC,
-                               IBlockPosConsumer iBlockPosConsumer) {
-        sizeA -= basePositionA;
-        sizeB -= basePositionB;
-        sizeC -= basePositionC;
-
-        int[] abc = new int[3];
-        int[] xyz = new int[3];
-
-        for (abc[2] = -basePositionC; abc[2] < sizeC; abc[2]++) {
-            for (abc[1] = -basePositionB; abc[1] < sizeB; abc[1]++) {
-                for (abc[0] = -basePositionA; abc[0] < sizeA; abc[0]++) {
-                    extendedFacing.getWorldOffset(abc, xyz);
-                    iBlockPosConsumer.consume(world, xyz[0] + basePositionX, xyz[1] + basePositionY, xyz[2] + basePositionZ);
-                }
-
-            }
-        }
-    }
-
-    public static void iterate(World world, ExtendedFacing extendedFacing,
-                               int basePositionX, int basePositionY, int basePositionZ,
-                               int basePositionA, int basePositionB, int basePositionC,
-                               boolean transpose, int sizeA, int sizeB, int sizeC,
-                               IBlockPosConsumer iBlockPosConsumer,
-                               Runnable nextB,
-                               Runnable nextC) {
-        sizeA -= basePositionA;
-        sizeB -= basePositionB;
-        sizeC -= basePositionC;
-
-        int[] abc = new int[3];
-        int[] xyz = new int[3];
-        if (transpose) {
-            for (abc[1] = -basePositionB; abc[1] < sizeB; abc[1]++) {
-                for (abc[2] = -basePositionC; abc[2] < sizeC; abc[2]++) {
-                    for (abc[0] = -basePositionA; abc[0] < sizeA; abc[0]++) {
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        iBlockPosConsumer.consume(world, xyz[0] + basePositionX, xyz[1] + basePositionY, xyz[2] + basePositionZ);
-                    }
-                    nextB.run();
-                }
-                nextC.run();
-            }
-        } else {
-            for (abc[2] = -basePositionC; abc[2] < sizeC; abc[2]++) {
-                for (abc[1] = -basePositionB; abc[1] < sizeB; abc[1]++) {
-                    for (abc[0] = -basePositionA; abc[0] < sizeA; abc[0]++) {
-                        extendedFacing.getWorldOffset(abc, xyz);
-                        iBlockPosConsumer.consume(world, xyz[0] + basePositionX, xyz[1] + basePositionY, xyz[2] + basePositionZ);
-                    }
-                    nextB.run();
-                }
-                nextC.run();
-            }
-        }
-    }
-
-    /**
-     * Transposes shape (swaps B and C axis, can be used to un-transpose transposed shape)
-     * WARNING! Do not use on old api...
-     *
-     * @param structurePiece shape (transposed shape)
-     * @return transposed shape (untransposed shape)
-     */
-    public static String[][] transpose(String[][] structurePiece) {
-        String[][] shape = new String[structurePiece[0].length][structurePiece.length];
-        for (int i = 0; i < structurePiece.length; i++) {
-            for (int j = 0; j < structurePiece[i].length; j++) {
-                shape[j][i] = structurePiece[i][j];
-            }
-        }
-        return shape;
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java
deleted file mode 100644
index 908c4c4aca..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.technus.tectech.mechanics.structure.adders;
-
-
-import net.minecraft.block.Block;
-
-public interface IBlockAdder<T> {
-    /**
-     * Callback on block added, needs to check if block is valid (and add it)
-     * @param block block attempted to add
-     * @param meta meta of block attempted to add
-     * @return is structure still valid
-     */
-    boolean apply(T t,Block block, Integer meta);
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java
deleted file mode 100644
index a47befc2e8..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.github.technus.tectech.mechanics.structure.adders;
-
-
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-
-public interface IHatchAdder<T> {
-    /**
-     * Callback to add hatch, needs to check if hatch is valid (and add it)
-     * @param iGregTechTileEntity hatch
-     * @param aShort requested texture index, or null if not...
-     * @return managed to add hatch (structure still valid)
-     */
-    boolean apply(T t,IGregTechTileEntity iGregTechTileEntity, Short aShort);
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java
deleted file mode 100644
index cc3c7dbb7a..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.github.technus.tectech.mechanics.structure.adders;
-
-import net.minecraft.tileentity.TileEntity;
-
-public interface ITileAdder<T> {
-    /**
-     * Callback to add hatch, needs to check if tile is valid (and add it)
-     * @param tileEntity tile
-     * @return managed to add hatch (structure still valid)
-     */
-    boolean apply(T t,TileEntity tileEntity);
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java b/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java
index 3b56b6968c..2adc25bbed 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/tesla/ITeslaConnectableSimple.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.tesla;
 
-import com.github.technus.tectech.util.Vec3Impl;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 
 public interface ITeslaConnectableSimple {
     //-128 to -1 disables capability
diff --git a/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java b/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java
index 5c6fef6af8..0b84236709 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/tesla/TeslaCoverConnection.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.tesla;
 
-import com.github.technus.tectech.util.Vec3Impl;
 import com.google.common.base.Objects;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetAdd;
@@ -14,7 +14,10 @@ public class TeslaCoverConnection implements ITeslaConnectableSimple {
 
     public TeslaCoverConnection(IGregTechTileEntity IGT, byte teslaReceptionCapability) {
         this.IGT = IGT;
-        this.pos = new Vec3Impl(IGT);
+        this.pos = new Vec3Impl(IGT.getXCoord(),
+                                IGT.getYCoord(),
+                                IGT.getZCoord());
+
         this.teslaReceptionCapability = teslaReceptionCapability;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java
index 358d55be0e..114dc7399f 100644
--- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java
+++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java
@@ -215,18 +215,18 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler {
             int tSpecial = ((CachedDefaultRecipe) arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;
             short ampere=(short) (tSpecial & 0xFFFF),minComputationPerSec=(short)(tSpecial>>>16);
 			if (tEUt != 0) {
-                drawText(10, 73, trans("152","Max Total: ") + (1+ (computation-minComputationPerSec) /minComputationPerSec) * (long)tEUt * ampere * 20 + " EU", -16777216);
-                drawText(10, 83, trans("153","Usage: ") + (long)tEUt*ampere + " EU/t", -16777216);
+                drawText(10, 73, trans("152","Max Total: ") + GT_Utility.formatNumbers((1+ (computation-minComputationPerSec) /minComputationPerSec) * (long)tEUt * ampere * 20) + " EU", -16777216);
+                drawText(10, 83, trans("153","Usage: ") + GT_Utility.formatNumbers((long)tEUt*ampere) + " EU/t", -16777216);
 				if (mRecipeMap.mShowVoltageAmperageInNEI) {
-                    drawText(10, 93, trans("154","Voltage: ") + tEUt + " EU", -16777216);
-                    drawText(10, 103, trans("155","Amperage: ") + ampere, -16777216);
+                    drawText(10, 93, trans("154","Voltage: ") + GT_Utility.formatNumbers(tEUt) + " EU", -16777216);
+                    drawText(10, 103, trans("155","Amperage: ") + GT_Utility.formatNumbers(ampere), -16777216);
 				} else {
                     drawText(10, 93, trans("156","Voltage: unspecified"), -16777216);
                     drawText(10, 103, trans("157","Amperage: unspecified"), -16777216);
 				}
 			}
-            drawText(10, 113, "Computation: "+computation, -16777216);
-            drawText(10, 123, "Min Computation: "+minComputationPerSec + " /s", -16777216);
+            drawText(10, 113, "Computation: " + GT_Utility.formatNumbers(computation), -16777216);
+            drawText(10, 123, "Min Computation: " + GT_Utility.formatNumbers(minComputationPerSec) + " /s", -16777216);
 		} else {
 			int i = 0;
 			for (String descLine : recipeDesc) {
diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java
index 0c7651977e..2dc4604fd5 100644
--- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java
+++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java
@@ -215,18 +215,18 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler {
             int tSpecial = ((CachedDefaultRecipe) arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;
             short ampere=(short) (tSpecial & 0xFFFF),minComputationPerSec=(short)(tSpecial>>>16);
 			if (tEUt != 0) {
-                drawText(10, 73, trans("152","Max Total: ") + (1+ (computation-minComputationPerSec) /minComputationPerSec) * (long)tEUt * ampere * 20 + " EU", -16777216);
-                drawText(10, 83, trans("153","Usage: ") + (long)tEUt*ampere + " EU/t", -16777216);
+                drawText(10, 73, trans("152","Max Total: ") + GT_Utility.formatNumbers((1+ (computation-minComputationPerSec) /minComputationPerSec) * (long)tEUt * ampere * 20) + " EU", -16777216);
+                drawText(10, 83, trans("153","Usage: ") + GT_Utility.formatNumbers((long)tEUt*ampere) + " EU/t", -16777216);
 				if (mRecipeMap.mShowVoltageAmperageInNEI) {
-                    drawText(10, 93, trans("154","Voltage: ") + tEUt + " EU", -16777216);
-                    drawText(10, 103, trans("155","Amperage: ") + ampere, -16777216);
+                    drawText(10, 93, trans("154","Voltage: ") + GT_Utility.formatNumbers(tEUt) + " EU", -16777216);
+                    drawText(10, 103, trans("155","Amperage: ") + GT_Utility.formatNumbers(ampere), -16777216);
 				} else {
                     drawText(10, 93, trans("156","Voltage: unspecified"), -16777216);
                     drawText(10, 103, trans("157","Amperage: unspecified"), -16777216);
 				}
 			}
-            drawText(10, 113, "Computation: "+computation, -16777216);
-            drawText(10, 123, "Min Computation: "+minComputationPerSec + " /s", -16777216);
+            drawText(10, 113, "Computation: " + GT_Utility.formatNumbers(computation), -16777216);
+            drawText(10, 123, "Min Computation: " + GT_Utility.formatNumbers(minComputationPerSec) + " /s", -16777216);
 		} else {
 			int i = 0;
 			for (String descLine : recipeDesc) {
diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
index 6a2a81057e..f8dc6a2d74 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -1,9 +1,7 @@
 package com.github.technus.tectech.proxy;
 
 import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.openmodularturrets.TT_turret_loader;
-import com.github.technus.tectech.entity.fx.BlockHint;
 import com.github.technus.tectech.entity.fx.WeightlessParticleFX;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.block.QuantumGlassRender;
@@ -16,7 +14,6 @@ import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.gui.GuiNewChat;
@@ -24,7 +21,6 @@ import net.minecraft.client.particle.EntityFX;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -48,42 +44,6 @@ public class ClientProxy extends CommonProxy {
         }
     }
 
-    @Override
-    public void hint_particle_tinted(World w,int x, int y, int z, IIcon[] icons,short[] RGBa) {
-        Minecraft.getMinecraft().effectRenderer.addEffect(new BlockHint(w,x,y,z,icons).withColorTint(RGBa));
-
-        EntityFX particle = new WeightlessParticleFX(w, x + RANDOM.nextFloat() * 0.5F, y + RANDOM.nextFloat() * 0.5F, z + RANDOM.nextFloat() * 0.5F, 0, 0, 0);
-        particle.setRBGColorF(0, 0.6F * RANDOM.nextFloat(), 0.8f);
-        Minecraft.getMinecraft().effectRenderer.addEffect(particle);
-    }
-
-    @Override
-    public void hint_particle_tinted(World w,int x, int y, int z, Block block, int meta,short[] RGBa) {
-        Minecraft.getMinecraft().effectRenderer.addEffect(new BlockHint(w,x,y,z,block,meta).withColorTint(RGBa));
-
-        EntityFX particle = new WeightlessParticleFX(w, x + RANDOM.nextFloat() * 0.5F, y + RANDOM.nextFloat() * 0.5F, z + RANDOM.nextFloat() * 0.5F, 0, 0, 0);
-        particle.setRBGColorF(0, 0.6F * RANDOM.nextFloat(), 0.8f);
-        Minecraft.getMinecraft().effectRenderer.addEffect(particle);
-    }
-
-    @Override
-    public void hint_particle(World w,int x, int y, int z, IIcon[] icons) {
-        Minecraft.getMinecraft().effectRenderer.addEffect(new BlockHint(w,x,y,z,icons));
-
-        EntityFX particle = new WeightlessParticleFX(w, x + RANDOM.nextFloat() * 0.5F, y + RANDOM.nextFloat() * 0.5F, z + RANDOM.nextFloat() * 0.5F, 0, 0, 0);
-        particle.setRBGColorF(0, 0.6F * RANDOM.nextFloat(), 0.8f);
-        Minecraft.getMinecraft().effectRenderer.addEffect(particle);
-    }
-
-    @Override
-    public void hint_particle(World w,int x, int y, int z, Block block, int meta) {
-        Minecraft.getMinecraft().effectRenderer.addEffect(new BlockHint(w,x,y,z,block,meta));
-
-        EntityFX particle = new WeightlessParticleFX(w, x + RANDOM.nextFloat() * 0.5F, y + RANDOM.nextFloat() * 0.5F, z + RANDOM.nextFloat() * 0.5F, 0, 0, 0);
-        particle.setRBGColorF(0, 0.6F * RANDOM.nextFloat(), 0.8f);
-        Minecraft.getMinecraft().effectRenderer.addEffect(particle);
-    }
-
     @Override
     public void em_particle(IGregTechTileEntity aMuffler, byte facing) {//CUTE!
         ForgeDirection aDir = ForgeDirection.getOrientation(facing);
diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
index 599d3e1c2c..97cd4a6ea6 100644
--- a/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
+++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipeAdder.java
@@ -8,16 +8,20 @@ import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.ElementalDefinitionContainer_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_crafting;
 import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine;
+import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.ItemList;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_RecipeAdder;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 public class  TT_recipeAdder extends GT_RecipeAdder {
@@ -39,16 +43,8 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
                 TecTech.LOGGER.error("addResearchableAssemblingLineRecipe "+aResearchItem.getDisplayName()+" --> "+aOutput.getUnlocalizedName()+" there is some null item in that recipe");
             }
         }
-        if(researchAmperage<=0) {
-            researchAmperage = 1;
-        } else if(researchAmperage > Short.MAX_VALUE) {
-            researchAmperage = Short.MAX_VALUE;
-        }
-        if(computationRequiredPerSec<=0) {
-            computationRequiredPerSec = 1;
-        } else if(computationRequiredPerSec > Short.MAX_VALUE) {
-            computationRequiredPerSec = Short.MAX_VALUE;
-        }
+        researchAmperage = GT_Utility.clamp(researchAmperage, 1, Short.MAX_VALUE);
+        computationRequiredPerSec = GT_Utility.clamp(computationRequiredPerSec, 1, Short.MAX_VALUE);
         TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result")}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false, aInputs, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result")}, aFluidInputs, null, assDuration, assEUt, 0,true);
         GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine(CustomItemList.UnusedStuff.get(1), totalComputationRequired/computationRequiredPerSec, aInputs, aFluidInputs, aOutput, assDuration, assEUt));
@@ -69,17 +65,23 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
 
         ItemStack[] tInputs = new ItemStack[aInputs.length];
         ItemStack[][] tAlts = new ItemStack[aInputs.length][];
+        int tPersistentHash = 1;
         for(int i = 0; i < aInputs.length; i++){
             Object obj = aInputs[i];
             if (obj instanceof ItemStack) {
                 tInputs[i] = (ItemStack) obj;
                 tAlts[i] = null;
+                tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(tInputs[i], true, false);
                 continue;
             } else if (obj instanceof ItemStack[]) {
                 ItemStack[] aStacks = (ItemStack[]) obj;
                 if (aStacks.length > 0) {
                     tInputs[i] = aStacks[0];
-                    tAlts[i] = Arrays.copyOf(aStacks, aStacks.length);
+                    tAlts[i] = (ItemStack[]) Arrays.copyOf(aStacks, aStacks.length);
+                    for (ItemStack tAlt : tAlts[i]) {
+                        tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(tAlt, true, false);
+                    }
+                    tPersistentHash *= 31;
                     continue;
                 }
             } else if (obj instanceof Object[]) {
@@ -87,16 +89,24 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
                 List<ItemStack> tList;
                 if (objs.length >= 2 && !(tList = GT_OreDictUnificator.getOres(objs[0])).isEmpty()) {
                     try {
+                        // sort the output, so the hash code is stable across launches
+                        tList.sort(Comparator.<ItemStack, String>comparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId)
+                                .thenComparing(s -> GameRegistry.findUniqueIdentifierFor(s.getItem()).modId)
+                                .thenComparingInt(Items.feather::getDamage)
+                                .thenComparingInt(s -> s.stackSize));
                         int tAmount = ((Number) objs[1]).intValue();
                         List<ItemStack> uList = new ArrayList<>();
                         for (ItemStack tStack : tList) {
                             ItemStack uStack = GT_Utility.copyAmount(tAmount, tStack);
                             if (GT_Utility.isStackValid(uStack)) {
                                 uList.add(uStack);
-                                if (tInputs[i] == null) tInputs[i] = uStack;
+                                if (tInputs[i] == null)
+                                    tInputs[i] = uStack;
                             }
                         }
-                        tAlts[i] = uList.toArray(nullItem);
+                        tAlts[i] = uList.toArray(new ItemStack[0]);
+                        tPersistentHash = tPersistentHash * 31 + (objs[0] == null ? "" : objs[0].toString()).hashCode();
+                        tPersistentHash = tPersistentHash * 31 + tAmount;
                         continue;
                     } catch (Exception t) {
                         TecTech.LOGGER.error("addAssemblingLineRecipe "+aResearchItem.getDisplayName()+" --> there is some ... in that recipe");
@@ -105,20 +115,29 @@ public class  TT_recipeAdder extends GT_RecipeAdder {
             }
             TecTech.LOGGER.error("addAssemblingLineRecipe "+aResearchItem.getDisplayName()+" --> "+aOutput.getUnlocalizedName()+" there is some null item in that recipe");
         }
-        if(researchAmperage<=0) {
-            researchAmperage = 1;
-        } else if(researchAmperage > Short.MAX_VALUE) {
-            researchAmperage = Short.MAX_VALUE;
-        }
-        if(computationRequiredPerSec<=0) {
-            computationRequiredPerSec = 1;
-        } else if(computationRequiredPerSec > Short.MAX_VALUE) {
-            computationRequiredPerSec = Short.MAX_VALUE;
+        tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aResearchItem, true, false);
+        tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(aOutput, true, false);
+        for (FluidStack tFluidInput : aFluidInputs) {
+            if (tFluidInput == null)
+                continue;
+            tPersistentHash = tPersistentHash * 31 + GT_Utility.persistentHash(tFluidInput, true, false);
         }
+        researchAmperage = GT_Utility.clamp(researchAmperage, 1, Short.MAX_VALUE);
+        computationRequiredPerSec = GT_Utility.clamp(computationRequiredPerSec, 1, Short.MAX_VALUE);
+        tPersistentHash = tPersistentHash * 31 + totalComputationRequired;
+        tPersistentHash = tPersistentHash * 31 + computationRequiredPerSec;
+        tPersistentHash = tPersistentHash * 31 + researchAmperage;
+        tPersistentHash = tPersistentHash * 31 + researchEUt;
+        tPersistentHash = tPersistentHash * 31 + assDuration;
+        tPersistentHash = tPersistentHash * 31 + assEUt;
         TT_recipe.GT_Recipe_MapTT.sResearchableFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Writes Research result")}, null, null, totalComputationRequired, researchEUt, researchAmperage| computationRequiredPerSec<<16);
         GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.addFakeRecipe(false,tInputs,new ItemStack[]{aOutput},new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Reads Research result")},aFluidInputs,null,assDuration,assEUt,0,tAlts,true);
-        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( CustomItemList.UnusedStuff.get(1), totalComputationRequired/computationRequiredPerSec, tInputs, aFluidInputs, aOutput, assDuration, assEUt, tAlts));
-        TT_recipe.GT_Recipe_MapTT.sAssemblylineRecipes.add(new GT_Recipe.GT_Recipe_AssemblyLine( aResearchItem, totalComputationRequired/computationRequiredPerSec, tInputs, aFluidInputs, aOutput, assDuration, assEUt, tAlts));
+        GT_Recipe_AssemblyLine recipeGT = new GT_Recipe_AssemblyLine(CustomItemList.UnusedStuff.get(1), totalComputationRequired / computationRequiredPerSec, tInputs, aFluidInputs, aOutput, assDuration, assEUt, tAlts);
+        recipeGT.setPersistentHash(tPersistentHash);
+        GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(recipeGT);
+        GT_Recipe_AssemblyLine recipeTT = new GT_Recipe_AssemblyLine(aResearchItem, totalComputationRequired / computationRequiredPerSec, tInputs, aFluidInputs, aOutput, assDuration, assEUt, tAlts);
+        recipeTT.setPersistentHash(tPersistentHash);
+        TT_recipe.GT_Recipe_MapTT.sAssemblylineRecipes.add(recipeTT);
         return true;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
index 9bd69c67ed..9e555e3961 100644
--- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
@@ -94,7 +94,7 @@ public enum CustomItemList implements IItemContainer {
 
     eM_avr_HV, eM_avr_EV, eM_avr_IV, eM_avr_LuV, eM_avr_ZPM, eM_avr_UV, eM_avr_UHV, eM_avr_UEV, eM_avr_UIV, eM_avr_UMV,
 
-    scanContainer, parametrizerMemory, teslaCapacitor, teslaCover, teslaComponent, teslaStaff, enderLinkFluidCover,
+    scanContainer, parametrizerMemory, teslaCapacitor, teslaCover, teslaComponent, teslaStaff, enderLinkFluidCover, powerPassUpgradeCover,
 
     Machine_TeslaCoil_1by1_LV, Machine_TeslaCoil_1by1_MV, Machine_TeslaCoil_1by1_HV, Machine_TeslaCoil_1by1_EV, Machine_TeslaCoil_1by1_IV,
     Machine_TeslaCoil_2by2_LV, Machine_TeslaCoil_2by2_MV, Machine_TeslaCoil_2by2_HV, Machine_TeslaCoil_2by2_EV, Machine_TeslaCoil_2by2_IV,
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
deleted file mode 100644
index 9648e41d8d..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_HintTT.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.github.technus.tectech.thing.casing;
-
-import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.thing.CustomItemList;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Block_Casings_Abstract;
-import gregtech.common.blocks.GT_Material_Casings;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
-import java.util.List;
-
-import static com.github.technus.tectech.TecTech.creativeTabTecTech;
-
-/**
- * Created by danie_000 on 03.10.2016.
- */
-public class GT_Block_HintTT extends GT_Block_Casings_Abstract {
-    private static IIcon[] hint = new IIcon[16];
-
-    public GT_Block_HintTT() {
-        super(GT_Item_HintTT.class, "gt.blockhintTT", GT_Material_Casings.INSTANCE);
-        setCreativeTab(creativeTabTecTech);
-
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hint 1 dot");//id is -1
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hint 2 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hint 3 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hint 4 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hint 5 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hint 6 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hint 7 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hint 8 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hint 9 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hint 10 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Hint 11 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Hint 12 dots");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Hint general");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Hint air");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Hint no air");
-        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Hint error");
-
-
-        CustomItemList.hint_0.set(new ItemStack(this, 1, 0));
-        CustomItemList.hint_1.set(new ItemStack(this, 1, 1));
-        CustomItemList.hint_2.set(new ItemStack(this, 1, 2));
-        CustomItemList.hint_3.set(new ItemStack(this, 1, 3));
-        CustomItemList.hint_4.set(new ItemStack(this, 1, 4));
-        CustomItemList.hint_5.set(new ItemStack(this, 1, 5));
-        CustomItemList.hint_6.set(new ItemStack(this, 1, 6));
-        CustomItemList.hint_7.set(new ItemStack(this, 1, 7));
-        CustomItemList.hint_8.set(new ItemStack(this, 1, 8));
-        CustomItemList.hint_9.set(new ItemStack(this, 1, 9));
-        CustomItemList.hint_10.set(new ItemStack(this, 1, 10));
-        CustomItemList.hint_11.set(new ItemStack(this, 1, 11));
-        CustomItemList.hint_general.set(new ItemStack(this, 1, 12));
-        CustomItemList.hint_air.set(new ItemStack(this, 1, 13));
-        CustomItemList.hint_noAir.set(new ItemStack(this, 1, 14));
-        CustomItemList.hint_error.set(new ItemStack(this, 1, 15));
-    }
-
-    @Override
-    public void registerBlockIcons(IIconRegister aIconRegister) {
-        //super.registerBlockIcons(aIconRegister);
-        hint[0] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_0");
-        hint[1] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_1");
-        hint[2] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_2");
-        hint[3] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_3");
-        hint[4] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_4");
-        hint[5] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_5");
-        hint[6] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_6");
-        hint[7] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_7");
-        hint[8] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_8");
-        hint[9] =  aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_9");
-        hint[10] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_10");
-        hint[11] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_11");
-        hint[12] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_DEFAULT");
-        hint[13] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_AIR");
-        hint[14] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_NOAIR");
-        hint[15] = aIconRegister.registerIcon(Reference.MODID+":iconsets/HINT_ERROR");
-    }
-
-    @Override
-    public IIcon getIcon(int aSide, int aMeta) {
-        return hint[aMeta];
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) {
-        int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord);
-        return getIcon(aSide, tMeta);
-    }
-
-    @Override
-    public void getSubBlocks(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
-        for (int i = 0; i <= 15; i++) {
-            aList.add(new ItemStack(aItem, 1, i));
-        }
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
index 071a4ae28f..40bb20d545 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/TT_Container_Casings.java
@@ -7,7 +7,7 @@ import net.minecraft.block.Block;
  */
 public final class TT_Container_Casings {
     public static Block sBlockCasingsTT;
-    public static Block sHintCasingsTT;
+
     public static Block sBlockCasingsBA0;
 
     public static Block sBlockCasingsNH;
diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
index c5243b8bc5..d6b5e28b18 100644
--- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
+++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
@@ -224,22 +224,22 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior {
             resetColorField();
             //Public/Private Buttons
             newButtonWithSpacing(PUBLIC_BUTTON_ID, 0, 2, GT_GuiIcon.WHITELIST)
-                    .setTooltipText("Public");
+                    .setTooltipText(trans("326", "Public"));
             newButtonWithSpacing(PRIVATE_BUTTON_ID, 1, 2, GT_GuiIcon.BLACKLIST)
-                    .setTooltipText("Private");
+                    .setTooltipText(trans("327", "Private"));
             //Import/Export Buttons
             newButtonWithSpacing(IMPORT_BUTTON_ID, 0, 3, GT_GuiIcon.IMPORT)
                     .setTooltipText(trans("007", "Import"));
             newButtonWithSpacing(EXPORT_BUTTON_ID, 1, 3, GT_GuiIcon.EXPORT)
-                    .setTooltipText(trans("007", "Export"));
+                    .setTooltipText(trans("006", "Export"));
         }
 
         @Override
         public void drawExtras(int mouseX, int mouseY, float parTicks) {
             super.drawExtras(mouseX, mouseY, parTicks);
             drawColorSquare(0, 0);
-            drawNewString("Color Value", 2, 0);
-            drawNewString("Public/Private", 2, 2);
+            drawNewString(trans("328", "Color Value"), 2, 0);
+            drawNewString(trans("329", "Public/Private"), 2, 2);
             drawNewString(trans("229", "Import/Export"), 2, 3);
         }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
deleted file mode 100644
index 3d00fcdf35..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.github.technus.tectech.thing.item;
-
-import com.github.technus.tectech.mechanics.constructable.ConstructableUtility;
-import com.github.technus.tectech.util.CommonValues;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-import java.util.List;
-
-import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.TecTech.creativeTabTecTech;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by Tec on 15.03.2017.
- */
-public final class ConstructableTriggerItem extends Item {
-    public static ConstructableTriggerItem INSTANCE;
-
-    private ConstructableTriggerItem() {
-        setUnlocalizedName("em.constructable");
-        setTextureName(MODID + ":itemConstructable");
-        setCreativeTab(creativeTabTecTech);
-    }
-
-    @Override
-    public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
-        return ConstructableUtility.handle(aStack, aPlayer, aWorld, aX, aY, aZ, aSide);
-    }
-
-    @Override
-    public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.TEC_MARK_GENERAL);
-        aList.add(translateToLocal("item.em.constructable.desc.0"));//Triggers Constructable Interface
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.constructable.desc.1"));//Shows multiblock construction details,
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.constructable.desc.2"));//just Use on a multiblock controller.
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.constructable.desc.3"));//(Sneak Use in creative to build)
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.constructable.desc.4"));//Quantity affects tier/mode/type
-    }
-
-    public static void run() {
-        INSTANCE = new ConstructableTriggerItem();
-        GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
deleted file mode 100644
index b74f40f336..0000000000
--- a/src/main/java/com/github/technus/tectech/thing/item/FrontRotationTriggerItem.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.github.technus.tectech.thing.item;
-
-import com.github.technus.tectech.mechanics.alignment.AlignmentUtility;
-import com.github.technus.tectech.util.CommonValues;
-import cpw.mods.fml.common.registry.GameRegistry;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
-
-import java.util.List;
-
-import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.TecTech.creativeTabTecTech;
-import static net.minecraft.util.StatCollector.translateToLocal;
-
-/**
- * Created by Tec on 15.03.2017.
- */
-public final class FrontRotationTriggerItem extends Item {
-    public static FrontRotationTriggerItem INSTANCE;
-
-    private FrontRotationTriggerItem() {
-        setMaxStackSize(1);
-        setUnlocalizedName("em.frontRotate");
-        setTextureName(MODID + ":itemFrontRotate");
-        setCreativeTab(creativeTabTecTech);
-    }
-
-    @Override
-    public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {
-        return AlignmentUtility.handle(aPlayer,aWorld,aX,aY,aZ);
-    }
-
-    @Override
-    public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
-        aList.add(CommonValues.TEC_MARK_GENERAL);
-        aList.add(translateToLocal("item.em.frontRotate.desc.0"));//Triggers Front Rotation Interface
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.frontRotate.desc.1"));//Rotates only the front panel,
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.frontRotate.desc.2"));//which allows structure rotation.
-    }
-
-    public static void run() {
-        INSTANCE = new FrontRotationTriggerItem();
-        GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java
index 7dcf8bb48a..06c05e5b9d 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/PowerPassUpgradeCover.java
@@ -13,7 +13,7 @@ import net.minecraft.util.EnumChatFormatting;
 import java.util.List;
 
 import static com.github.technus.tectech.Reference.MODID;
-import static com.github.technus.tectech.thing.CustomItemList.enderLinkFluidCover;
+import static com.github.technus.tectech.thing.CustomItemList.powerPassUpgradeCover;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 public final class PowerPassUpgradeCover extends Item {
@@ -28,15 +28,15 @@ public final class PowerPassUpgradeCover extends Item {
     @Override
     public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
         aList.add(CommonValues.BASS_MARK);
-        aList.add(translateToLocal("item.tm.powerpassupgradecover.desc.0"));//Ender-Fluid-Enables Machines!
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.powerpassupgradecover.desc.1"));//Use on any side of a fluid tank to link it to the Ender
-        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.powerpassupgradecover.desc.2"));//Ender Tanks so are laggy -Bot from the Chads of NH
+        aList.add(translateToLocal("item.tm.powerpassupgradecover.desc.0"));//Add power pass functionality to TecTech Multiblocks
+        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.powerpassupgradecover.desc.1"));//Active transformer in a can??
+        aList.add(EnumChatFormatting.BLUE + translateToLocal("item.tm.powerpassupgradecover.desc.2"));//Chain them up like Christmas lights!
     }
 
     public static void run() {
         INSTANCE = new PowerPassUpgradeCover();
         GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
-        enderLinkFluidCover.set(INSTANCE);
+        powerPassUpgradeCover.set(INSTANCE);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
index 6cbf1e801b..4aa90339cc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
@@ -160,7 +160,10 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket
     @Override
     public String[] getInfoData() {
         if (id > 0) {
-            return new String[]{translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id, translateToLocalFormatted("tt.keyword.Content", clientLocale) + ": " + EnumChatFormatting.AQUA + (q != null ? q.getContentString() : 0), translateToLocalFormatted("tt.keyword.PacketHistory", clientLocale) + ": " + EnumChatFormatting.RED + (q != null ? q.getTraceSize() : 0),};
+            return new String[]{
+                    translateToLocalFormatted("tt.keyword.ID", clientLocale) + ": " + EnumChatFormatting.AQUA + id,
+                    translateToLocalFormatted("tt.keyword.Content", clientLocale) + ": " + EnumChatFormatting.AQUA + (q != null ? q.getContentString() : 0),
+                    translateToLocalFormatted("tt.keyword.PacketHistory", clientLocale) + ": " + EnumChatFormatting.RED + (q != null ? q.getTraceSize() : 0),};
         }
         return new String[]{
                 translateToLocalFormatted("tt.keyword.Content", clientLocale) + ": " + EnumChatFormatting.AQUA + (q != null ? q.getContentString() : 0),
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
index 202dc344c2..b015d71b60 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
@@ -111,7 +111,8 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
         return new String[]{
                 CommonValues.TEC_MARK_GENERAL,
                 mDescription,//TODO NOT PASS DESCRIPTION
-                translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + EnumChatFormatting.YELLOW + (Amperes * maxEUOutput()) + EnumChatFormatting.RESET + " EU/t"//Throughput
+                translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": "
+                        + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(Amperes * maxEUOutput()) + EnumChatFormatting.RESET + " EU/t"//Throughput
         };
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
index 4410372d47..0acb9849a7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
@@ -6,6 +6,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -116,7 +117,8 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch
         return new String[]{
                 CommonValues.TEC_MARK_GENERAL,
                 mDescription,
-                translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " + EnumChatFormatting.AQUA + maxAmperesIn() + " A"//Amperes In
+                translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": "
+                        + EnumChatFormatting.AQUA + GT_Utility.formatNumbers(maxAmperesIn()) + " A"//Amperes In
         };
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
index 854678b79b..d44119e1ab 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
@@ -6,6 +6,7 @@ import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -108,7 +109,8 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc
         return new String[]{
                 CommonValues.TEC_MARK_GENERAL,
                 mDescription,
-                translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + EnumChatFormatting.YELLOW + (Amperes * maxEUInput()) + EnumChatFormatting.RESET + " EU/t"//Throughput
+                translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": "
+                        + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(Amperes * maxEUInput()) + EnumChatFormatting.RESET + " EU/t"//Throughput
         };
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
index 6a9b24ef55..2a04af23d1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
@@ -12,6 +12,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -90,8 +91,8 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
         return new String[]{
                 CommonValues.TEC_MARK_EM,
                 mDescription,
-                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + EnumChatFormatting.AQUA + String.format(Locale.ENGLISH, "%+.2E", overflowMax) + " eV/c\u00b2",
-                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + EnumChatFormatting.AQUA + String.format(Locale.ENGLISH, "%+.2E", overflowDisperse) + " (eV/c\u00b2)/s",
+                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + EnumChatFormatting.AQUA + GT_Utility.formatNumbers(overflowMax) + " eV/c\u00b2",
+                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + EnumChatFormatting.AQUA + GT_Utility.formatNumbers(overflowDisperse) + " (eV/c\u00b2)/s",
                 translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3")
         };
     }
@@ -216,9 +217,10 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
     public String[] getInfoData() {
         return new String[]{
                 translateToLocalFormatted("tt.keyphrase.Contained_mass", clientLocale) + ":",
-                EnumChatFormatting.RED + Double.toString(overflowMatter) + EnumChatFormatting.RESET + " eV/c\u00b2 /",
-                EnumChatFormatting.GREEN + Double.toString(overflowMax) + EnumChatFormatting.RESET + " eV/c\u00b2",
-                translateToLocalFormatted("tt.keyphrase.Mass_Disposal_speed", clientLocale) + ": " + EnumChatFormatting.BLUE + overflowDisperse + EnumChatFormatting.RESET + " (eV/c\u00b2)/s"
+                EnumChatFormatting.RED + GT_Utility.formatNumbers(overflowMatter) + EnumChatFormatting.RESET + " eV/c\u00b2 /",
+                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(overflowMax) + EnumChatFormatting.RESET + " eV/c\u00b2",
+                translateToLocalFormatted("tt.keyphrase.Mass_Disposal_speed", clientLocale) + ": " +
+                        EnumChatFormatting.BLUE + GT_Utility.formatNumbers(overflowDisperse) + EnumChatFormatting.RESET + " (eV/c\u00b2)/s"
         };
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
index 584e28a607..4580c545af 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
@@ -1,27 +1,28 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -31,30 +32,6 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl
     //region variables
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
-    //endregion
-
-    //region structure
-    private static final String[][] shape = new String[][]{
-            {"\u0002", "D000", "C0   0", "C0 . 0", "C0   0", "D000"},
-            {"C01A10", "C01A10", "D1A1", "00B101B00", "11111111111", "C01110", "11111111111", "00B101B00", "D1A1", "C01A10", "C01A10",},
-            {"C01A10", "A223222322", "A244242442", "03442424430", "12225252221", "A244222442", "12225252221", "03442424430", "A244242442", "A223222322", "C01A10",},
-            {"D111", "A244222442", "A4G4", "A4G4", "12G21", "12G21", "12G21", "A4G4", "A4G4", "A244222442", "D111",},
-            {"A0C0C0", "03444244430", "A4G4", "A4G4", "A4G4", "02G20", "A4G4", "A4G4", "A4G4", "03444244430", "A0C0C0",},
-            {"00C!C00", "02444544420", "A4G4", "A4G4", "A4G4", "!5G5!", "A4G4", "A4G4", "A4G4", "02444544420", "00C!C00",},
-            {"A0C0C0", "03444244430", "A4G4", "A4G4", "A4G4", "02G20", "A4G4", "A4G4", "A4G4", "03444244430", "A0C0C0",},
-            {"D111", "A244222442", "A4G4", "A4G4", "12G21", "12G21", "12G21", "A4G4", "A4G4", "A244222442", "D111",},
-            {"C01A10", "A223222322", "A244242442", "03442424430", "12225252221", "A244222442", "12225252221", "03442424430", "A244242442", "A223222322", "C01A10",},
-            {"C01A10", "C01A10", "D1A1", "00B101B00", "11111111111", "C01110", "11111111111", "00B101B00", "D1A1", "C01A10", "C01A10",},
-            {"\u0002", "D000", "C0   0", "C0   0", "C0   0", "D000"},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{4, 5, 12, 6, 0, 10};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_annihilation>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_annihilation::addClassicToMachineList,
-            GT_MetaTileEntity_EM_annihilation::addElementalToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.annihilation.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -62,6 +39,33 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl
     };
     //endregion
 
+    //region structure
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_annihilation> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_annihilation>builder()
+                    .addShape("main", transpose(new String[][]{
+                            {"           ","   AB BA   ","   AB BA   ","    BBB    "," A   A   A ","AA   F   AA"," A   A   A ","    BBB    ","   AB BA   ","   AB BA   ","           "},
+                            {"           ","   AB BA   "," EECEEECEE "," EGGEEEGGE ","ACGGGEGGGCA","AEGGGDGGGEA","ACGGGEGGGCA"," EGGEEEGGE "," EECEEECEE ","   AB BA   ","           "},
+                            {"           ","    B B    "," EGGEGEGGE "," G       G "," G       G "," G       G "," G       G "," G       G "," EGGEGEGGE ","    B B    ","           "},
+                            {"    AAA    ","AA  BAB  AA","ACGGEGEGGCA"," G       G "," G       G "," G       G "," G       G "," G       G ","ACGGEGEGGCA","AA  BAB  AA","    AAA    "},
+                            {"   AHHHA   ","BBBBBBBBBBB","BEEEDEDEEEB","BE       EB"," G       G "," G       G "," G       G ","BE       EB","BEEEDEDEEEB","BBBBBBBBBBB","   AHHHA   "},
+                            {"   AH~HA   ","   ABBBA   "," EGGEEEGGE ","BE       EB","AE       EA","FD       DF","AE       EA","BE       EB"," EGGEEEGGE ","   ABBBA   ","   AHHHA   "},
+                            {"   AHHHA   ","BBBBBBBBBBB","BEEEDEDEEEB","BE       EB"," G       G "," G       G "," G       G ","BE       EB","BEEEDEDEEEB","BBBBBBBBBBB","   AHHHA   "},
+                            {"    AAA    ","AA  BAB  AA","ACGGEGEGGCA"," G       G "," G       G "," G       G "," G       G "," G       G ","ACGGEGEGGCA","AA  BAB  AA","    AAA    "},
+                            {"           ","    B B    "," EGGEGEGGE "," G       G "," G       G "," G       G "," G       G "," G       G "," EGGEGEGGE ","    B B    ","           "},
+                            {"           ","   AB BA   "," EECEEECEE "," EGGEEEGGE ","ACGGGEGGGCA","AEGGGDGGGEA","ACGGGEGGGCA"," EGGEEEGGE "," EECEEECEE ","   AB BA   ","           "},
+                            {"           ","   AB BA   ","   AB BA   ","    BBB    "," A   A   A ","AA   F   AA"," A   A   A ","    BBB    ","   AB BA   ","   AB BA   ","           "}
+                    }))
+                    .addElement('A', ofBlock(sBlockCasingsTT, 4))
+                    .addElement('B', ofBlock(sBlockCasingsTT, 5))
+                    .addElement('C', ofBlock(sBlockCasingsTT, 6))
+                    .addElement('D', ofBlock(sBlockCasingsTT, 10))
+                    .addElement('E', ofBlock(sBlockCasingsTT, 12))
+                    .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_annihilation::addElementalToMachineList, textureOffset + 4,2, sBlockCasingsTT, 4))
+                    .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+                    .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_annihilation::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+                    .build();
+    //endregion
+
     public GT_MetaTileEntity_EM_annihilation(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
@@ -77,7 +81,7 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 5, 5, 0);
+        return structureCheck_EM("main", 5, 5, 0);
     }
 
     @Override
@@ -107,7 +111,12 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 5, 5, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 5, 5, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_annihilation> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
index 06476fb62e..363f184ebc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -17,14 +17,14 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.ofBlock;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.ofHatchAdderOptional;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_INGOT_MASS_DIFF;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_decay.URANIUM_MASS_TO_EU_INSTANT;
-import static gregtech.api.enums.GT_Values.E;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -49,92 +49,90 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E
     //per dim disable thingies
 
     //region structure actual
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_bhg> STRUCTURE_DEFINITION= StructureDefinition
-            .<GT_MetaTileEntity_EM_bhg>builder()
-            .addShapeOldApi("t1",new String[][]{
-                    {"\u000B", "M0000000", "L00     00", "L0       0", "L0  !!!  0", "L0  !.!  0", "L0  !!!  0", "L0       0", "L00     00", "M0000000",},
-                    {"\u0008", "O0A0", "O0A0", "O0A0", "O0A0", "N11111", "M1101011", "I000010010010000", "M1111111", "I000010010010000", "M1101011", "N11111", "O0A0", "O0A0", "O0A0", "O0A0",},
-                    {"\u0006", "O0A0", "O0A0", "O0A0", "P1", "P1", "M1111111", "L11E11", "L1B222B1", "G000B1A23332A1B000", "J111A23332A111", "G000B1A23332A1B000", "L1B222B1", "L11E11", "M1111111", "P1", "P1", "O0A0", "O0A0", "O0A0",},
-                    {"\u0005", "O0A0", "O0A0", "P1", "P1", "\u0004", "F00Q00", "H11M11", "F00Q00", "\u0004", "P1", "P1", "O0A0", "O0A0",},
-                    {"\u0004", "O0A0", "N00000", "P1", "P4", "P4", "\u0003", "F0S0", "E00S00", "F0144M4410", "E00S00", "F0S0", "\u0003", "P4", "P4", "P1", "N00000", "O0A0",},
-                    {"\u0003", "O0A0", "O0A0", "P1", "M2224222", "\u0004", "G2Q2", "G2Q2", "D00A2Q2A00", "F14Q41", "D00A2Q2A00", "G2Q2", "G2Q2", "\u0004", "M2224222", "P1", "O0A0", "O0A0",},
-                    {"\u0002", "O0A0", "N00000", "P1", "P4", "\u0006", "D0W0", "C00W00", "D014S410", "C00W00", "D0W0", "\u0006", "P4", "P1", "N00000", "O0A0",},
-                    {"\u0001", "O0A0", "O0A0", "P1", "M2224222", "\u0006", "E2U2", "E2U2", "B00A2U2A00", "D14U41", "B00A2U2A00", "E2U2", "E2U2", "\u0006", "M2224222", "P1", "O0A0", "O0A0",},
-                    {"\u0001", "O0A0", "P1", "P4", "\u0009", "B0[0", "C14W41", "B0[0", "\u0009", "P4", "P1", "O0A0",},
-                    {E, "O0A0", "O0A0", "P1", "P4", "\u0009", "A00[00", "C14W41", "A00[00", "\u0009", "P4", "P1", "O0A0", "O0A0",},
-                    {E, "O0A0", "P1", "\u000B", "A0]0", "B1[1", "A0]0", "\u000B", "P1", "O0A0",},
-                    {E, "O0A0", "P1", "\u000B", "A0]0", "B1[1", "A0]0", "\u000B", "P1", "O0A0",},
-                    {"O0A0", "O0A0", "M1111111", "\u0009", "B1[1", "B1[1", "001[100", "B1[1", "001[100", "B1[1", "B1[1", "\u0009", "M1111111", "O0A0", "O0A0",},
-                    {"O0A0", "N11111", "L11E11", "\u0001", "G2Q2", E, "E2U2", "\u0003", "B1[1", "B1[1", "A1]1", "01]10", "A1]1", "01]10", "A1]1", "B1[1", "B1[1", "\u0003", "E2U2", E, "G2Q2", "\u0001", "L11E11", "N11111", "O0A0",},
-                    {"O0A0", "M1101011", "L1B222B1", E, "F0S0", "G2Q2", "D0W0", "E2U2", "\u0003", "B1[1", "A1]1", "A1]1", "002[200", "A12[21", "002[200", "A1]1", "A1]1", "B1[1", "\u0003", "E2U2", "D0W0", "G2Q2", "F0S0", E, "L1B222B1", "M1101011", "O0A0",},
-                    {"L000000000", "I000010010010000", "G000B1A23332A1B000", "F00Q00", "E00S00", "D00A2Q2A00", "C00W00", "B00A2U2A00", "B0[0", "A00[00", "A0]0", "A0]0", "001[100", "01]10", "002[200", "003[300", "013[310", "003[300", "002[200", "01]10", "001[100", "A0]0", "A0]0", "A00[00", "B0[0", "B00A2U2A00", "C00W00", "D00A2Q2A00", "E00S00", "F00Q00", "G000B1A23332A1B000", "I000010010010000", "L000000000",},
-                    {"O0A0", "M1111111", "J111A23332A111", "H11M11", "F0144M4410", "F14Q41", "D014S410", "D14U41", "C14W41", "C14W41", "B1[1", "B1[1", "B1[1", "A1]1", "A12[21", "013[310", "A13[31", "013[310", "A12[21", "A1]1", "B1[1", "B1[1", "B1[1", "C14W41", "C14W41", "D14U41", "D014S410", "F14Q41", "F0144M4410", "H11M11", "J111A23332A111", "M1111111", "O0A0",},
-                    {"L000000000", "I000010010010000", "G000B1A23332A1B000", "F00Q00", "E00S00", "D00A2Q2A00", "C00W00", "B00A2U2A00", "B0[0", "A00[00", "A0]0", "A0]0", "001[100", "01]10", "002[200", "003[300", "013[310", "003[300", "002[200", "01]10", "001[100", "A0]0", "A0]0", "A00[00", "B0[0", "B00A2U2A00", "C00W00", "D00A2Q2A00", "E00S00", "F00Q00", "G000B1A23332A1B000", "I000010010010000", "L000000000",},
-                    {"O0A0", "M1101011", "L1B222B1", E, "F0S0", "G2Q2", "D0W0", "E2U2", "\u0003", "B1[1", "A1]1", "A1]1", "002[200", "A12[21", "002[200", "A1]1", "A1]1", "B1[1", "\u0003", "E2U2", "D0W0", "G2Q2", "F0S0", E, "L1B222B1", "M1101011", "O0A0",},
-                    {"O0A0", "N11111", "L11E11", "\u0001", "G2Q2", E, "E2U2", "\u0003", "B1[1", "B1[1", "A1]1", "01]10", "A1]1", "01]10", "A1]1", "B1[1", "B1[1", "\u0003", "E2U2", E, "G2Q2", "\u0001", "L11E11", "N11111", "O0A0",},
-                    {"O0A0", "O0A0", "M1111111", "\u0009", "B1[1", "B1[1", "001[100", "B1[1", "001[100", "B1[1", "B1[1", "\u0009", "M1111111", "O0A0", "O0A0",},
-                    {E, "O0A0", "P1", "\u000B", "A0]0", "B1[1", "A0]0", "\u000B", "P1", "O0A0",},
-                    {E, "O0A0", "P1", "\u000B", "A0]0", "B1[1", "A0]0", "\u000B", "P1", "O0A0",},
-                    {E, "O0A0", "O0A0", "P1", "P4", "\u0009", "A00[00", "C14W41", "A00[00", "\u0009", "P4", "P1", "O0A0", "O0A0",},
-                    {"\u0001", "O0A0", "P1", "P4", "\u0009", "B0[0", "C14W41", "B0[0", "\u0009", "P4", "P1", "O0A0",},
-                    {"\u0001", "O0A0", "O0A0", "P1", "M2224222", "\u0006", "E2U2", "E2U2", "B00A2U2A00", "D14U41", "B00A2U2A00", "E2U2", "E2U2", "\u0006", "M2224222", "P1", "O0A0", "O0A0",},
-                    {"\u0002", "O0A0", "N00000", "P1", "P4", "\u0006", "D0W0", "C00W00", "D014S410", "C00W00", "D0W0", "\u0006", "P4", "P1", "N00000", "O0A0",},
-                    {"\u0003", "O0A0", "O0A0", "P1", "M2224222", "\u0004", "G2Q2", "G2Q2", "D00A2Q2A00", "F14Q41", "D00A2Q2A00", "G2Q2", "G2Q2", "\u0004", "M2224222", "P1", "O0A0", "O0A0",},
-                    {"\u0004", "O0A0", "N00000", "P1", "P4", "P4", "\u0003", "F0S0", "E00S00", "F0144M4410", "E00S00", "F0S0", "\u0003", "P4", "P4", "P1", "N00000", "O0A0",},
-                    {"\u0005", "O0A0", "O0A0", "P1", "P1", "\u0004", "F00Q00", "H11M11", "F00Q00", "\u0004", "P1", "P1", "O0A0", "O0A0",},
-                    {"\u0006", "O0A0", "O0A0", "O0A0", "P1", "P1", "M1111111", "L11E11", "L1B222B1", "G000B1A23332A1B000", "J111A23332A111", "G000B1A23332A1B000", "L1B222B1", "L11E11", "M1111111", "P1", "P1", "O0A0", "O0A0", "O0A0",},
-                    {"\u0008", "O0A0", "O0A0", "O0A0", "O0A0", "N11111", "M1101011", "I000010010010000", "M1111111", "I000010010010000", "M1101011", "N11111", "O0A0", "O0A0", "O0A0", "O0A0",},
-                    {"\u000B", "O0A0", "O0A0", "O0A0", "L000000000", "O0A0", "L000000000", "O0A0", "O0A0", "O0A0",},
-            })
-            .addShapeOldApi("t2",new String[][]{
-                    {"\u000B", "M0000000", "L00     00", "L0       0", "L0  !!!  0", "L0  !.!  0", "L0  !!!  0", "L0       0", "L00     00", "M0000000",},
-                    {"\u0008", "O0A0", "M550A055", "L5550A0555", "K55550A05555", "J5555111115555", "J5551101011555", "I000010010010000", "M1111111", "I000010010010000", "J5551101011555", "J5555111115555", "K55550A05555", "L5550A0555", "M550A055", "O0A0",},
-                    {"\u0006", "O0A0", "M550A055", "K55550A05555", "J555C1C555", "I555D1D555", "I55B1111111B55", "H55B11E11B55", "H55B1B222B1B55", "G000B1A23332A1B000", "J111A23332A111", "G000B1A23332A1B000", "H55B1B222B1B55", "H55B11E11B55", "I55B1111111B55", "I555D1D555", "J555C1C555", "K55550A05555", "M550A055", "O0A0",},
-                    {"\u0005", "O0A0", "L5550A0555", "J555C1C555", "I55E1E55", "H55M55", "H5O5", "G55O55", "G5Q5", "G5Q5", "F00Q00", "H11M11", "F00Q00", "G5Q5", "G5Q5", "G55O55", "H5O5", "H55M55", "I55E1E55", "J555C1C555", "L5550A0555", "O0A0",},
-                    {"\u0004", "O0A0", "K55500000555", "I555D1D555", "H55F4F55", "G55G4G55", "G5Q5", "F55Q55", "F5S5", "F5S5", "F0S0", "E00S00", "F0144M4410", "E00S00", "F0S0", "F5S5", "F5S5", "F55Q55", "G5Q5", "G55G4G55", "H55F4F55", "I555D1D555", "K55500000555", "O0A0",},
-                    {"\u0003", "O0A0", "J555550A055555", "H555E1E555", "G55D2224222D55", "F55Q55", "F5S5", "E55S55", "E5U5", "E5U5", "E5A2Q2A5", "E5A2Q2A5", "D00A2Q2A00", "F14Q41", "D00A2Q2A00", "E5A2Q2A5", "E5A2Q2A5", "E5U5", "E5U5", "E55S55", "F5S5", "F55Q55", "G55D2224222D55", "H555E1E555", "J555550A055555", "O0A0",},
-                    {"\u0002", "O0A0", "K55500000555", "H555E1E555", "G55G4G55", "F5S5", "E55S55", "E5U5", "E5U5", "D5W5", "D5W5", "D5W5", "D0W0", "C00W00", "D014S410", "C00W00", "D0W0", "D5W5", "D5W5", "D5W5", "E5U5", "E5U5", "E55S55", "F5S5", "G55G4G55", "H555E1E555", "K55500000555", "O0A0",},
-                    {"\u0001", "O0A0", "L5550A0555", "I555D1D555", "G55D2224222D55", "F5S5", "E5U5", "E5U5", "D5W5", "D5W5", "D5W5", "C5Y5", "C5A2U2A5", "C5A2U2A5", "B00A2U2A00", "D14U41", "B00A2U2A00", "C5A2U2A5", "C5A2U2A5", "C5Y5", "D5W5", "D5W5", "D5W5", "E5U5", "E5U5", "F5S5", "G55D2224222D55", "I555D1D555", "L5550A0555", "O0A0",},
-                    {"\u0001", "M550A055", "J555C1C555", "H55F4F55", "F55Q55", "E55S55", "E5U5", "D5W5", "D5W5", "C5Y5", "C5Y5", "C5Y5", "B5[5", "B5[5", "B0[0", "C14W41", "B0[0", "B5[5", "B5[5", "C5Y5", "C5Y5", "C5Y5", "D5W5", "D5W5", "E5U5", "E55S55", "F55Q55", "H55F4F55", "J555C1C555", "M550A055",},
-                    {E, "O0A0", "K55550A05555", "I55E1E55", "G55G4G55", "F5S5", "E5U5", "D5W5", "D5W5", "C5Y5", "C5Y5", "B5[5", "B5[5", "B5[5", "B5[5", "A00[00", "C14W41", "A00[00", "B5[5", "B5[5", "B5[5", "B5[5", "C5Y5", "C5Y5", "D5W5", "D5W5", "E5U5", "F5S5", "G55G4G55", "I55E1E55", "K55550A05555", "O0A0",},
-                    {E, "M550A055", "J555C1C555", "H55M55", "G5Q5", "E55S55", "E5U5", "D5W5", "C5Y5", "C5Y5", "B5[5", "B5[5", "B5[5", "A5]5", "A5]5", "A0]0", "B1[1", "A0]0", "A5]5", "A5]5", "B5[5", "B5[5", "B5[5", "C5Y5", "C5Y5", "D5W5", "E5U5", "E55S55", "G5Q5", "H55M55", "J555C1C555", "M550A055",},
-                    {E, "L5550A0555", "I555D1D555", "H5O5", "F55Q55", "E5U5", "D5W5", "D5W5", "C5Y5", "B5[5", "B5[5", "B5[5", "A5]5", "A5]5", "A5]5", "A0]0", "B1[1", "A0]0", "A5]5", "A5]5", "A5]5", "B5[5", "B5[5", "B5[5", "C5Y5", "D5W5", "D5W5", "E5U5", "F55Q55", "H5O5", "I555D1D555", "L5550A0555",},
-                    {"O0A0", "K55550A05555", "I55B1111111B55", "G55O55", "F5S5", "E5U5", "D5W5", "C5Y5", "C5Y5", "B5[5", "B5[5", "A5]5", "A5]5", "A51[15", "A51[15", "001[100", "B1[1", "001[100", "A51[15", "A51[15", "A5]5", "A5]5", "B5[5", "B5[5", "C5Y5", "C5Y5", "D5W5", "E5U5", "F5S5", "G55O55", "I55B1111111B55", "K55550A05555", "O0A0",},
-                    {"O0A0", "J5555111115555", "H55B11E11B55", "G5Q5", "F5S5", "E5A2Q2A5", "D5W5", "C5A2U2A5", "B5[5", "B5[5", "A5]5", "A5]5", "A51[15", "A51[15", "A1]1", "01]10", "A1]1", "01]10", "A1]1", "A51[15", "A51[15", "A5]5", "A5]5", "B5[5", "B5[5", "C5A2U2A5", "D5W5", "E5A2Q2A5", "F5S5", "G5Q5", "H55B11E11B55", "J5555111115555", "O0A0",},
-                    {"O0A0", "J5551101011555", "H55B1B222B1B55", "G5Q5", "F0S0", "E5A2Q2A5", "D0W0", "C5A2U2A5", "B5[5", "B5[5", "A5]5", "A5]5", "A51[15", "A1]1", "A1]1", "002[200", "A12[21", "002[200", "A1]1", "A1]1", "A51[15", "A5]5", "A5]5", "B5[5", "B5[5", "C5A2U2A5", "D0W0", "E5A2Q2A5", "F0S0", "G5Q5", "H55B1B222B1B55", "J5551101011555", "O0A0",},
-                    {"L000000000", "I000010010010000", "G000B1A23332A1B000", "F00Q00", "E00S00", "D00A2Q2A00", "C00W00", "B00A2U2A00", "B0[0", "A00[00", "A0]0", "A0]0", "001[100", "01]10", "002[200", "003[300", "013[310", "003[300", "002[200", "01]10", "001[100", "A0]0", "A0]0", "A00[00", "B0[0", "B00A2U2A00", "C00W00", "D00A2Q2A00", "E00S00", "F00Q00", "G000B1A23332A1B000", "I000010010010000", "L000000000",},
-                    {"O0A0", "M1111111", "J111A23332A111", "H11M11", "F0144M4410", "F14Q41", "D014S410", "D14U41", "C14W41", "C14W41", "B1[1", "B1[1", "B1[1", "A1]1", "A12[21", "013[310", "A13[31", "013[310", "A12[21", "A1]1", "B1[1", "B1[1", "B1[1", "C14W41", "C14W41", "D14U41", "D014S410", "F14Q41", "F0144M4410", "H11M11", "J111A23332A111", "M1111111", "O0A0",},
-                    {"L000000000", "I000010010010000", "G000B1A23332A1B000", "F00Q00", "E00S00", "D00A2Q2A00", "C00W00", "B00A2U2A00", "B0[0", "A00[00", "A0]0", "A0]0", "001[100", "01]10", "002[200", "003[300", "013[310", "003[300", "002[200", "01]10", "001[100", "A0]0", "A0]0", "A00[00", "B0[0", "B00A2U2A00", "C00W00", "D00A2Q2A00", "E00S00", "F00Q00", "G000B1A23332A1B000", "I000010010010000", "L000000000",},
-                    {"O0A0", "J5551101011555", "H55B1B222B1B55", "G5Q5", "F0S0", "E5A2Q2A5", "D0W0", "C5A2U2A5", "B5[5", "B5[5", "A5]5", "A5]5", "A51[15", "A1]1", "A1]1", "002[200", "A12[21", "002[200", "A1]1", "A1]1", "A51[15", "A5]5", "A5]5", "B5[5", "B5[5", "C5A2U2A5", "D0W0", "E5A2Q2A5", "F0S0", "G5Q5", "H55B1B222B1B55", "J5551101011555", "O0A0",},
-                    {"O0A0", "J5555111115555", "H55B11E11B55", "G5Q5", "F5S5", "E5A2Q2A5", "D5W5", "C5A2U2A5", "B5[5", "B5[5", "A5]5", "A5]5", "A51[15", "A51[15", "A1]1", "01]10", "A1]1", "01]10", "A1]1", "A51[15", "A51[15", "A5]5", "A5]5", "B5[5", "B5[5", "C5A2U2A5", "D5W5", "E5A2Q2A5", "F5S5", "G5Q5", "H55B11E11B55", "J5555111115555", "O0A0",},
-                    {"O0A0", "K55550A05555", "I55B1111111B55", "G55O55", "F5S5", "E5U5", "D5W5", "C5Y5", "C5Y5", "B5[5", "B5[5", "A5]5", "A5]5", "A51[15", "A51[15", "001[100", "B1[1", "001[100", "A51[15", "A51[15", "A5]5", "A5]5", "B5[5", "B5[5", "C5Y5", "C5Y5", "D5W5", "E5U5", "F5S5", "G55O55", "I55B1111111B55", "K55550A05555", "O0A0",},
-                    {E, "L5550A0555", "I555D1D555", "H5O5", "F55Q55", "E5U5", "D5W5", "D5W5", "C5Y5", "B5[5", "B5[5", "B5[5", "A5]5", "A5]5", "A5]5", "A0]0", "B1[1", "A0]0", "A5]5", "A5]5", "A5]5", "B5[5", "B5[5", "B5[5", "C5Y5", "D5W5", "D5W5", "E5U5", "F55Q55", "H5O5", "I555D1D555", "L5550A0555",},
-                    {E, "M550A055", "J555C1C555", "H55M55", "G5Q5", "E55S55", "E5U5", "D5W5", "C5Y5", "C5Y5", "B5[5", "B5[5", "B5[5", "A5]5", "A5]5", "A0]0", "B1[1", "A0]0", "A5]5", "A5]5", "B5[5", "B5[5", "B5[5", "C5Y5", "C5Y5", "D5W5", "E5U5", "E55S55", "G5Q5", "H55M55", "J555C1C555", "M550A055",},
-                    {E, "O0A0", "K55550A05555", "I55E1E55", "G55G4G55", "F5S5", "E5U5", "D5W5", "D5W5", "C5Y5", "C5Y5", "B5[5", "B5[5", "B5[5", "B5[5", "A00[00", "C14W41", "A00[00", "B5[5", "B5[5", "B5[5", "B5[5", "C5Y5", "C5Y5", "D5W5", "D5W5", "E5U5", "F5S5", "G55G4G55", "I55E1E55", "K55550A05555", "O0A0",},
-                    {"\u0001", "M550A055", "J555C1C555", "H55F4F55", "F55Q55", "E55S55", "E5U5", "D5W5", "D5W5", "C5Y5", "C5Y5", "C5Y5", "B5[5", "B5[5", "B0[0", "C14W41", "B0[0", "B5[5", "B5[5", "C5Y5", "C5Y5", "C5Y5", "D5W5", "D5W5", "E5U5", "E55S55", "F55Q55", "H55F4F55", "J555C1C555", "M550A055",},
-                    {"\u0001", "O0A0", "L5550A0555", "I555D1D555", "G55D2224222D55", "F5S5", "E5U5", "E5U5", "D5W5", "D5W5", "D5W5", "C5Y5", "C5A2U2A5", "C5A2U2A5", "B00A2U2A00", "D14U41", "B00A2U2A00", "C5A2U2A5", "C5A2U2A5", "C5Y5", "D5W5", "D5W5", "D5W5", "E5U5", "E5U5", "F5S5", "G55D2224222D55", "I555D1D555", "L5550A0555", "O0A0",},
-                    {"\u0002", "O0A0", "K55500000555", "H555E1E555", "G55G4G55", "F5S5", "E55S55", "E5U5", "E5U5", "D5W5", "D5W5", "D5W5", "D0W0", "C00W00", "D014S410", "C00W00", "D0W0", "D5W5", "D5W5", "D5W5", "E5U5", "E5U5", "E55S55", "F5S5", "G55G4G55", "H555E1E555", "K55500000555", "O0A0",},
-                    {"\u0003", "O0A0", "J555550A055555", "H555E1E555", "G55D2224222D55", "F55Q55", "F5S5", "E55S55", "E5U5", "E5U5", "E5A2Q2A5", "E5A2Q2A5", "D00A2Q2A00", "F14Q41", "D00A2Q2A00", "E5A2Q2A5", "E5A2Q2A5", "E5U5", "E5U5", "E55S55", "F5S5", "F55Q55", "G55D2224222D55", "H555E1E555", "J555550A055555", "O0A0",},
-                    {"\u0004", "O0A0", "K55500000555", "I555D1D555", "H55F4F55", "G55G4G55", "G5Q5", "F55Q55", "F5S5", "F5S5", "F0S0", "E00S00", "F0144M4410", "E00S00", "F0S0", "F5S5", "F5S5", "F55Q55", "G5Q5", "G55G4G55", "H55F4F55", "I555D1D555", "K55500000555", "O0A0",},
-                    {"\u0005", "O0A0", "L5550A0555", "J555C1C555", "I55E1E55", "H55M55", "H5O5", "G55O55", "G5Q5", "G5Q5", "F00Q00", "H11M11", "F00Q00", "G5Q5", "G5Q5", "G55O55", "H5O5", "H55M55", "I55E1E55", "J555C1C555", "L5550A0555", "O0A0",},
-                    {"\u0006", "O0A0", "M550A055", "K55550A05555", "J555C1C555", "I555D1D555", "I55B1111111B55", "H55B11E11B55", "H55B1B222B1B55", "G000B1A23332A1B000", "J111A23332A111", "G000B1A23332A1B000", "H55B1B222B1B55", "H55B11E11B55", "I55B1111111B55", "I555D1D555", "J555C1C555", "K55550A05555", "M550A055", "O0A0",},
-                    {"\u0008", "O0A0", "M550A055", "L5550A0555", "K55550A05555", "J5555111115555", "J5551101011555", "I000010010010000", "M1111111", "I000010010010000", "J5551101011555", "J5555111115555", "K55550A05555", "L5550A0555", "M550A055", "O0A0",},
-                    {"\u000B", "O0A0", "O0A0", "O0A0", "L000000000", "O0A0", "L000000000", "O0A0", "O0A0", "O0A0",},
-            })
-            .addElement('0', ofBlock(sBlockCasingsTT,12))
-            .addElement('1', ofBlock(sBlockCasingsTT,13))
-            .addElement('2', ofBlock(sBlockCasingsTT,14))
-            .addElement('3', ofBlock(sBlockCasingsTT,10))
-            .addElement('4', ofBlock(sBlockCasingsTT,11))
-            .addElement('5', ofBlock(QuantumGlassBlock.INSTANCE,0))
-            .addElement(' ', ofHatchAdderOptional(GT_MetaTileEntity_EM_bhg::addClassicToMachineList,
-                    textureOffset,1,sBlockCasingsTT,0))
-            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_bhg::addElementalToMachineList,
-                    textureOffset + 4,2,sBlockCasingsTT,4))
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_bhg> STRUCTURE_DEFINITION=
+            StructureDefinition.<GT_MetaTileEntity_EM_bhg>builder()
+            .addShape("main_t1", transpose(new String[][]{
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","               C C               ","              DDDDD              ","             DDCDCDD             ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","             DDCDCDD             ","              DDDDD              ","               C C               ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","                D                ","                D                ","             DDDDDDD             ","            DD     DD            ","            D  EEE  D            ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","            D  EEE  D            ","            DD     DD            ","             DDDDDDD             ","                D                ","                D                ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                B                ","                                 ","                                 ","                                 ","                                 ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","                                 ","                                 ","                                 ","                                 ","                B                ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","       E                 E       ","       E                 E       ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","       E                 E       ","       E                 E       ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","     E                     E     ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","     E                     E     ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 "},
+                    {"                                 ","                                 ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  C                           C  ","   DB                       BD   ","  C                           C  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","                                 ","                                 "},
+                    {"                                 ","               C C               ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," CC                           CC ","   DB                       BD   "," CC                           CC ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","               C C               ","                                 "},
+                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
+                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
+                    {"             CCCCCCC             ","               C C               ","             DDDDDDD             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  ","CCD                           DCC","  D                           D  ","CCD                           DCC","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             DDDDDDD             ","               C C               ","               C C               "},
+                    {"            CCHHHHHCC            ","              DDDDD              ","            DD     DD            ","                                 ","                                 ","       E                 E       ","                                 ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D ","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","                                 ","       E                 E       ","                                 ","                                 ","            DD     DD            ","              DDDDD              ","               C C               "},
+                    {"            CHHHHHHHC            ","             DDCDCDD             ","            D  EEE  D            ","                                 ","      C                   C      ","       E                 E       ","    C                       C    ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","    C                       C    ","       E                 E       ","      C                   C      ","                                 ","            D  EEE  D            ","             DDCDCDD             ","               C C               "},
+                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
+                    {"            CHHF~FHHC            ","             DDDDDDD             ","          DDD EAAAE DDD          ","        DD             DD        ","      CDBB             BBDC      ","      DB                 BD      ","    CDB                   BDC    ","    DB                     BD    ","   DB                       BD   ","   DB                       BD   ","  D                           D  ","  D                           D  ","  D                           D  "," D                             D "," DE                           ED ","CDA                           ADC"," DA                           AD ","CDA                           ADC"," DE                           ED "," D                             D ","  D                           D  ","  D                           D  ","  D                           D  ","   DB                       BD   ","   DB                       BD   ","    DB                     BD    ","    CDB                   BDC    ","      DB                 BD      ","      CDBB             BBDC      ","        DD             DD        ","          DDD EAAAE DDD          ","             DDDDDDD             ","               C C               "},
+                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
+                    {"            CHHHHHHHC            ","             DDCDCDD             ","            D  EEE  D            ","                                 ","      C                   C      ","       E                 E       ","    C                       C    ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","    C                       C    ","       E                 E       ","      C                   C      ","                                 ","            D  EEE  D            ","             DDCDCDD             ","               C C               "},
+                    {"            CCHHHHHCC            ","              DDDDD              ","            DD     DD            ","                                 ","                                 ","       E                 E       ","                                 ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D ","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","                                 ","       E                 E       ","                                 ","                                 ","            DD     DD            ","              DDDDD              ","               C C               "},
+                    {"             CCCCCCC             ","               C C               ","             DDDDDDD             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  ","CCD                           DCC","  D                           D  ","CCD                           DCC","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             DDDDDDD             ","               C C               ","               C C               "},
+                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
+                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
+                    {"                                 ","               C C               ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," CC                           CC ","   DB                       BD   "," CC                           CC ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","               C C               ","                                 "},
+                    {"                                 ","                                 ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  C                           C  ","   DB                       BD   ","  C                           C  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","                                 ","                                 "},
+                    {"                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","     E                     E     ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","     E                     E     ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","       E                 E       ","       E                 E       ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","       E                 E       ","       E                 E       ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                B                ","                                 ","                                 ","                                 ","                                 ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","                                 ","                                 ","                                 ","                                 ","                B                ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","                                 ","                                 ","                                 ","                D                ","                D                ","                D                ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","                D                ","                D                ","             DDDDDDD             ","            DD     DD            ","            D  EEE  D            ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","            D  EEE  D            ","            DD     DD            ","             DDDDDDD             ","                D                ","                D                ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","               C C               ","              DDDDD              ","             DDCDCDD             ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","             DDCDCDD             ","              DDDDD              ","               C C               ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "}
+            }))
+            .addShape("main_t2", transpose(new String[][]{
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","            GGGC CGGG            ","           GGGGC CGGGG           ","          GGGGDDDDDGGGG          ","          GGGDDCDCDDGGG          ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","          GGGDDCDCDDGGG          ","          GGGGDDDDDGGGG          ","           GGGGC CGGGG           ","            GGGC CGGG            ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","           GGGGC CGGGG           ","          GGG   D   GGG          ","         GGG    D    GGG         ","         GG  DDDDDDD  GG         ","        GG  DD     DD  GG        ","        GG  D  EEE  D  GG        ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","        GG  D  EEE  D  GG        ","        GG  DD     DD  GG        ","         GG  DDDDDDD  GG         ","         GGG    D    GGG         ","          GGG   D   GGG          ","           GGGGC CGGGG           ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","            GGGC CGGG            ","          GGG   D   GGG          ","         GG     D     GG         ","        GG             GG        ","        G               G        ","       GG               GG       ","       G                 G       ","       G                 G       ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","       G                 G       ","       G                 G       ","       GG               GG       ","        G               G        ","        GG             GG        ","         GG     D     GG         ","          GGG   D   GGG          ","            GGGC CGGG            ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","         GGG    D    GGG         ","        GG      B      GG        ","       GG       B       GG       ","       G                 G       ","      GG                 GG      ","      G                   G      ","      G                   G      ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","      G                   G      ","      G                   G      ","      GG                 GG      ","       G                 G       ","       GG       B       GG       ","        GG      B      GG        ","         GGG    D    GGG         ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","          GGGGGC CGGGGG          ","        GGG     D     GGG        ","       GG    EEEBEEE    GG       ","      GG                 GG      ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","     G E                 E G     ","     G E                 E G     ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","     G E                 E G     ","     G E                 E G     ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","      GG                 GG      ","       GG    EEEBEEE    GG       ","        GGG     D     GGG        ","          GGGGGC CGGGGG          ","               C C               ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","        GGG     D     GGG        ","       GG       B       GG       ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","       GG       B       GG       ","        GGG     D     GGG        ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","               C C               ","            GGGC CGGG            ","         GGG    D    GGG         ","       GG    EEEBEEE    GG       ","      G                   G      ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","   G                         G   ","   G E                     E G   ","   G E                     E G   ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","   G E                     E G   ","   G E                     E G   ","   G                         G   ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","      G                   G      ","       GG    EEEBEEE    GG       ","         GGG    D    GGG         ","            GGGC CGGG            ","               C C               ","                                 ","                                 "},
+                    {"                                 ","                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG      B      GG        ","      GG                 GG      ","     GG                   GG     ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  C                           C  ","   DB                       BD   ","  C                           C  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","     GG                   GG     ","      GG                 GG      ","        GG      B      GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 ","                                 "},
+                    {"                                 ","               C C               ","           GGGGC CGGGG           ","         GG     D     GG         ","       GG       B       GG       ","      G                   G      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  "," CC                           CC ","   DB                       BD   "," CC                           CC ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      G                   G      ","       GG       B       GG       ","         GG     D     GG         ","           GGGGC CGGGG           ","               C C               ","                                 "},
+                    {"                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG             GG        ","       G                 G       ","     GG                   GG     ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","     GG                   GG     ","       G                 G       ","        GG             GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 "},
+                    {"                                 ","            GGGC CGGG            ","         GGG    D    GGG         ","        G               G        ","      GG                 GG      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      GG                 GG      ","        G               G        ","         GGG    D    GGG         ","            GGGC CGGG            ","                                 "},
+                    {"             CCCCCCC             ","           GGGGC CGGGG           ","         GG  DDDDDDD  GG         ","       GG               GG       ","      G                   G      ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG ","CCD                           DCC","  D                           D  ","CCD                           DCC"," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","      G                   G      ","       GG               GG       ","         GG  DDDDDDD  GG         ","           GGGGC CGGGG           ","               C C               "},
+                    {"            CCHHHHHCC            ","          GGGGDDDDDGGGG          ","        GG  DD     DD  GG        ","       G                 G       ","      G                   G      ","     G E                 E G     ","    G                       G    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D "," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    G                       G    ","     G E                 E G     ","      G                   G      ","       G                 G       ","        GG  DD     DD  GG        ","          GGGGDDDDDGGGG          ","               C C               "},
+                    {"            CHHHHHHHC            ","          GGGDDCDCDDGGG          ","        GG  D  EEE  D  GG        ","       G                 G       ","      C                   C      ","     G E                 E G     ","    C                       C    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    C                       C    ","     G E                 E G     ","      C                   C      ","       G                 G       ","        GG  D  EEE  D  GG        ","          GGGDDCDCDDGGG          ","               C C               "},
+                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
+                    {"            CHHF~FHHC            ","             DDDDDDD             ","          DDD EAAAE DDD          ","        DD             DD        ","      CDBB             BBDC      ","      DB                 BD      ","    CDB                   BDC    ","    DB                     BD    ","   DB                       BD   ","   DB                       BD   ","  D                           D  ","  D                           D  ","  D                           D  "," D                             D "," DE                           ED ","CDA                           ADC"," DA                           AD ","CDA                           ADC"," DE                           ED "," D                             D ","  D                           D  ","  D                           D  ","  D                           D  ","   DB                       BD   ","   DB                       BD   ","    DB                     BD    ","    CDB                   BDC    ","      DB                 BD      ","      CDBB             BBDC      ","        DD             DD        ","          DDD EAAAE DDD          ","             DDDDDDD             ","               C C               "},
+                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
+                    {"            CHHHHHHHC            ","          GGGDDCDCDDGGG          ","        GG  D  EEE  D  GG        ","       G                 G       ","      C                   C      ","     G E                 E G     ","    C                       C    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    C                       C    ","     G E                 E G     ","      C                   C      ","       G                 G       ","        GG  D  EEE  D  GG        ","          GGGDDCDCDDGGG          ","               C C               "},
+                    {"            CCHHHHHCC            ","          GGGGDDDDDGGGG          ","        GG  DD     DD  GG        ","       G                 G       ","      G                   G      ","     G E                 E G     ","    G                       G    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D "," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    G                       G    ","     G E                 E G     ","      G                   G      ","       G                 G       ","        GG  DD     DD  GG        ","          GGGGDDDDDGGGG          ","               C C               "},
+                    {"             CCCCCCC             ","           GGGGC CGGGG           ","         GG  DDDDDDD  GG         ","       GG               GG       ","      G                   G      ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG ","CCD                           DCC","  D                           D  ","CCD                           DCC"," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","      G                   G      ","       GG               GG       ","         GG  DDDDDDD  GG         ","           GGGGC CGGGG           ","               C C               "},
+                    {"                                 ","            GGGC CGGG            ","         GGG    D    GGG         ","        G               G        ","      GG                 GG      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      GG                 GG      ","        G               G        ","         GGG    D    GGG         ","            GGGC CGGG            ","                                 "},
+                    {"                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG             GG        ","       G                 G       ","     GG                   GG     ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","     GG                   GG     ","       G                 G       ","        GG             GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 "},
+                    {"                                 ","               C C               ","           GGGGC CGGGG           ","         GG     D     GG         ","       GG       B       GG       ","      G                   G      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  "," CC                           CC ","   DB                       BD   "," CC                           CC ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      G                   G      ","       GG       B       GG       ","         GG     D     GG         ","           GGGGC CGGGG           ","               C C               ","                                 "},
+                    {"                                 ","                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG      B      GG        ","      GG                 GG      ","     GG                   GG     ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  C                           C  ","   DB                       BD   ","  C                           C  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","     GG                   GG     ","      GG                 GG      ","        GG      B      GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 ","                                 "},
+                    {"                                 ","                                 ","               C C               ","            GGGC CGGG            ","         GGG    D    GGG         ","       GG    EEEBEEE    GG       ","      G                   G      ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","   G                         G   ","   G E                     E G   ","   G E                     E G   ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","   G E                     E G   ","   G E                     E G   ","   G                         G   ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","      G                   G      ","       GG    EEEBEEE    GG       ","         GGG    D    GGG         ","            GGGC CGGG            ","               C C               ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","        GGG     D     GGG        ","       GG       B       GG       ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","       GG       B       GG       ","        GGG     D     GGG        ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","          GGGGGC CGGGGG          ","        GGG     D     GGG        ","       GG    EEEBEEE    GG       ","      GG                 GG      ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","     G E                 E G     ","     G E                 E G     ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","     G E                 E G     ","     G E                 E G     ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","      GG                 GG      ","       GG    EEEBEEE    GG       ","        GGG     D     GGG        ","          GGGGGC CGGGGG          ","               C C               ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","         GGG    D    GGG         ","        GG      B      GG        ","       GG       B       GG       ","       G                 G       ","      GG                 GG      ","      G                   G      ","      G                   G      ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","      G                   G      ","      G                   G      ","      GG                 GG      ","       G                 G       ","       GG       B       GG       ","        GG      B      GG        ","         GGG    D    GGG         ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","            GGGC CGGG            ","          GGG   D   GGG          ","         GG     D     GG         ","        GG             GG        ","        G               G        ","       GG               GG       ","       G                 G       ","       G                 G       ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","       G                 G       ","       G                 G       ","       GG               GG       ","        G       D       G        ","        GG      D      GG        ","         GG     D     GG         ","          GGG   D   GGG          ","            GGGC CGGG            ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","           GGGGC CGGGG           ","          GGG   D   GGG          ","         GGG    D    GGG         ","         GG  DDDDDDD  GG         ","        GG  DD     DD  GG        ","        GG  D  EEE  D  GG        ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","        GG  D  EEE  D  GG        ","        GG  DD     DD  GG        ","         GG  DDDDDDD  GG         ","         GGG    D    GGG         ","          GGG   D   GGG          ","           GGGGC CGGGG           ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","            GGGC CGGG            ","           GGGGC CGGGG           ","          GGGGDDDDDGGGG          ","          GGGDDCDCDDGGG          ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","          GGGDDCDCDDGGG          ","          GGGGDDDDDGGGG          ","           GGGGC CGGGG           ","            GGGC CGGG            ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
+                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 10))
+            .addElement('B', ofBlock(sBlockCasingsTT, 11))
+            .addElement('C', ofBlock(sBlockCasingsTT, 12))
+            .addElement('D', ofBlock(sBlockCasingsTT, 13))
+            .addElement('E', ofBlock(sBlockCasingsTT, 14))
+            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_bhg::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_bhg::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .build();
 
     @Override
-    public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() {
+    public IStructureDefinition<GT_MetaTileEntity_EM_bhg> getStructure_EM() {
         return STRUCTURE_DEFINITION;
     }
 
@@ -308,7 +306,12 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        structureBuild_EM((stackSize.stackSize&1)==1?"t1":"t2", 16, 16, 0, hintsOnly,stackSize);
+        try {
+            structureBuild_EM((stackSize.stackSize & 1) == 1 ? "main_t1" : "main_t2", 16, 16, 0, stackSize, hintsOnly);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index 6a6a707399..3e2b029bba 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -1,10 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Rack;
@@ -12,7 +9,10 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.util.Vec3Impl;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -22,7 +22,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -30,13 +29,15 @@ import net.minecraft.util.ResourceLocation;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT;
 import static com.github.technus.tectech.util.CommonValues.V;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -51,23 +52,44 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region structure
-    private static final String[][] front = new String[][]{{"A  ", "A  ", "A. ", "A  ",},};
-    private static final String[][] terminator = new String[][]{{"A  ", "A  ", "A  ", "A  ",},};
-    private static final String[][] cap = new String[][]{{"-01", "A22", "A22", "-01",},};
-    private static final String[][] slice = new String[][]{{"-01", "A!2", "A!2", "-01",},};
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{2, 1, 3};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_computer>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_computer::addToMachineList,
-            GT_MetaTileEntity_EM_computer::addRackToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset + 1, textureOffset + 3};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{1, 3};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.computer.hint.0"),//1 - Classic/Data Hatches or Computer casing
             translateToLocal("gt.blockmachines.multimachine.em.computer.hint.1"),//2 - Rack Hatches or Advanced computer casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_computer> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_computer>builder()
+            .addShape("front", transpose(new String[][]{
+                    {" AA"},
+                    {" AA"},
+                    {" ~A"},
+                    {" AA"}
+            }))
+            .addShape("cap", transpose(new String[][]{
+                    {"-CB"},
+                    {" DD"},
+                    {" DD"},
+                    {"-CB"}
+            }))
+            .addShape("slice", transpose(new String[][]{
+                    {"-CB"},
+                    {" ED"},
+                    {" ED"},
+                    {"-CB"}
+            }))
+            .addShape("back", transpose(new String[][]{
+                    {" AA"},
+                    {" AA"},
+                    {" AA"},
+                    {" AA"}
+            }))
+            .addElement('A', ofHatchAdderOptional(GT_MetaTileEntity_EM_computer::addToMachineList, textureOffset + 1, 1, sBlockCasingsTT, 1))
+            .addElement('B', ofBlock(sBlockCasingsTT, 1))
+            .addElement('C', ofBlock(sBlockCasingsTT, 2))
+            .addElement('D', ofBlock(sBlockCasingsTT, 3))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_computer::addRackToMachineList, textureOffset + 3, 2, sBlockCasingsTT, 3))
+            .build();
     //endregion
 
     //region parameters
@@ -129,15 +151,15 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
             }
         }
         eRacks.clear();
-        if (!structureCheck_EM(front, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 2, 0)) {
+        if (!structureCheck_EM("front", 1, 2, 0)) {
             return false;
         }
-        if (!structureCheck_EM(cap, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 2, -1)) {
+        if (!structureCheck_EM("cap", 1, 2, -1)) {
             return false;
         }
         byte offset = -2, totalLen = 4;
         while (offset > -16) {
-            if (!structureCheck_EM(slice, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 2, offset)) {
+            if (!structureCheck_EM("slice", 1, 2, offset)) {
                 break;
             }
             totalLen++;
@@ -146,10 +168,10 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
         if (totalLen > 17) {
             return false;
         }
-        if (!structureCheck_EM(cap, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 2, ++offset)) {
+        if (!structureCheck_EM("cap", 1, 2, ++offset)) {
             return false;
         }
-        if (!structureCheck_EM(terminator, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 2, --offset)) {
+        if (!structureCheck_EM("back", 1, 2, --offset)) {
             return false;
         }
         eCertainMode = (byte) Math.min(totalLen / 3, 5);
@@ -246,7 +268,10 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     @Override
     public void outputAfterRecipe_EM() {
         if (!eOutputData.isEmpty()) {
-            Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity());
+            Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity().getXCoord(),
+                                        getBaseMetaTileEntity().getYCoord(),
+                                        getBaseMetaTileEntity().getZCoord());
+
             QuantumDataPacket pack = new QuantumDataPacket(eAvailableData / eOutputData.size()).unifyTraceWith(pos);
             if (pack == null) {
                 return;
@@ -359,16 +384,21 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
         IGregTechTileEntity igt = getBaseMetaTileEntity();
-        Structure.builder(front, blockType, blockMeta, 1, 2, 0, igt, getExtendedFacing(), hintsOnly);
-        Structure.builder(cap, blockType, blockMeta, 1, 2, -1, igt, getExtendedFacing(), hintsOnly);
+        structureBuild_EM("front", 1, 2, 0, stackSize, hintsOnly);
+        structureBuild_EM("cap", 1, 2, -1, stackSize, hintsOnly);
 
         byte offset = -2;
         for (int rackSlices = Math.min(stackSize.stackSize, 12); rackSlices > 0; rackSlices--) {
-            Structure.builder(slice, blockType, blockMeta, 1, 2, offset--, igt, getExtendedFacing(), hintsOnly);
+            structureBuild_EM("slice", 1 , 2, offset--, stackSize, hintsOnly);
         }
 
-        Structure.builder(cap, blockType, blockMeta, 1, 2, offset--, igt, getExtendedFacing(), hintsOnly);
-        Structure.builder(terminator, blockType, blockMeta, 1, 2, offset, igt, getExtendedFacing(), hintsOnly);
+        structureBuild_EM("cap", 1, 2, offset--, stackSize, hintsOnly);
+        structureBuild_EM("back", 1, 2, offset, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_computer> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java
index 7d8204c07f..22e4ea5eea 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java
@@ -1,27 +1,28 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -36,32 +37,30 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"A000", "0   0", "0 . 0", "0   0", "A000",},
-            {"00000", "00000", "00000", "00000", "00000",},
-            {"0C0", "A!!!", "A!1!", "A!!!", "0C0",},
-            {"22222", "22222", "22122", "22222", "22222",},
-            {"23432", "33333", "43134", "33333", "23432",},
-            {"23332", "33333", "33533", "33333", "23332",},
-            {"23432", "33333", "43134", "33333", "23432",},
-            {"22222", "22222", "22122", "22222", "22222",},
-            {"0C0", "A!!!", "A!1!", "A!!!", "0C0",},
-            {"00000", "00000", "00000", "00000", "00000",},
-            {"A000", "0   0", "0   0", "0   0", "A000",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{4, 10, 5, 0, 6, 9};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_crafting>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_crafting::addClassicToMachineList,
-            GT_MetaTileEntity_EM_crafting::addElementalToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_crafting> STRUCTURE_DEFINITION= StructureDefinition
+            .<GT_MetaTileEntity_EM_crafting>builder()
+            .addShape("main", transpose(new String[][]{
+                    {" AAA ","AAAAA","A   A","BBBBB","BGCGB","BGGGB","BGCGB","BBBBB","A   A","AAAAA"," AAA "},
+                    {"AHHHA","AAAAA"," FFF ","BBBBB","GGGGG","GGGGG","GGGGG","BBBBB"," FFF ","AAAAA","AHHHA"},
+                    {"AH~HA","AAAAA"," FEF ","BBEBB","CGEGC","GGDGG","CGEGC","BBEBB"," FEF ","AAAAA","AHHHA"},
+                    {"AHHHA","AAAAA"," FFF ","BBBBB","GGGGG","GGGGG","GGGGG","BBBBB"," FFF ","AAAAA","AHHHA"},
+                    {" AAA ","AAAAA","A   A","BBBBB","BGCGB","BGGGB","BGCGB","BBBBB","A   A","AAAAA"," AAA "}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 4))
+            .addElement('B', ofBlock(sBlockCasingsTT, 5))
+            .addElement('C', ofBlock(sBlockCasingsTT, 6))
+            .addElement('D', ofBlock(sBlockCasingsTT, 9))
+            .addElement('E', ofBlock(sBlockCasingsTT, 10))
+            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_crafting::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_crafting::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_crafting(int aID, String aName, String aNameRegional) {
@@ -79,7 +78,7 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0);
+        return structureCheck_EM("main", 2, 2, 0);
     }
 
     @Override
@@ -109,7 +108,12 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 2, 2, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_crafting> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
index 582be290ac..cccdbbd2d9 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
@@ -1,10 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.dataTransport.InventoryDataPacket;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputDataItems;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputDataItems;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
@@ -12,6 +9,9 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContaine
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -20,7 +20,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess;
-import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -28,12 +27,14 @@ import net.minecraft.util.ResourceLocation;
 
 import java.util.ArrayList;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
@@ -43,24 +44,24 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"0   0", "0 . 0", "0   0",},
-            {"0!!!0", "01110", "0!!!0",},
-            {"0!!!0", "0!!!0", "0!!!0",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{2, 1};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_dataBank>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_dataBank::addClassicToMachineList,
-            GT_MetaTileEntity_EM_dataBank::addDataBankHatchToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 1};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 1};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.databank.hint.0"),//1 - Classic Hatches or high power casing
             translateToLocal("gt.blockmachines.multimachine.em.databank.hint.1"),//2 - Data Access/Data Bank Master Hatches or computer casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_dataBank> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_dataBank>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"BCCCB","BDDDB","BDDDB"},
+                    {"BC~CB","BAAAB","BDDDB"},
+                    {"BCCCB","BDDDB","BDDDB"}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 1))
+            .addElement('B', ofBlock(sBlockCasingsTT, 2))
+            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_dataBank::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_dataBank::addDataBankHatchToMachineList, textureOffset + 1, 2, sBlockCasingsTT, 1))
+            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_dataBank(int aID, String aName, String aNameRegional) {
@@ -80,7 +81,7 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
         eDataAccessHatches.clear();
         eStacksDataOutputs.clear();
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 1, 0);
+        return structureCheck_EM("main", 2, 1, 0);
     }
 
     @Override
@@ -174,7 +175,12 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 2, 1, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 2, 1, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_dataBank> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index 1978d2acfc..0da76c2fce 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -1,10 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
@@ -13,6 +10,8 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -23,7 +22,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import ic2.core.init.MainConfig;
 import ic2.core.util.ConfigUtil;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -32,13 +30,14 @@ import net.minecraft.util.EnumChatFormatting;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW;
 import static com.github.technus.tectech.util.CommonValues.VN;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
@@ -58,25 +57,27 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
     //endregion
 
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"0C0", "A   ", "A . ", "A   ", "0C0",},
-            {"00000", "00000", "00000", "00000", "00000",},
-            {"0C0", "A!!!", "A!0!", "A!!!", "0C0",},
-            {"01110", "12221", "12221", "12221", "01110",},
-            {"01310", "12221", "32223", "12221", "01310",},
-            {"01110", "12221", "12221", "12221", "01110",},
-            {"0C0", "A!!!", "A!0!", "A!!!", "0C0",},
-            {"00000", "00000", "00000", "00000", "00000",},
-            {"0C0", "A   ", "A   ", "A   ", "0C0",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{4, 5, 8, 6};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_decay>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_decay::addClassicToMachineList,
-            GT_MetaTileEntity_EM_decay::addElementalToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4};
+    public static final IStructureDefinition<GT_MetaTileEntity_EM_decay> STRUCTURE_DEFINITION=IStructureDefinition
+            .<GT_MetaTileEntity_EM_decay>builder()
+            .addShape("main",new String[][]{
+                    {"0   0", " &&& ", " &~& ", " &&& ", "0   0",},
+                    {"00000", "00000", "00000", "00000", "00000",},
+                    {"0   0", " !!! ", " !0! ", " !!! ", "0   0",},
+                    {"01110", "12221", "12221", "12221", "01110",},
+                    {"01310", "12221", "32223", "12221", "01310",},
+                    {"01110", "12221", "12221", "12221", "01110",},
+                    {"0   0", " !!! ", " !0! ", " !!! ", "0   0",},
+                    {"00000", "00000", "00000", "00000", "00000",},
+                    {"0   0", " &&& ", " &&& ", " &&& ", "0   0",},
+            })
+            .addElement('0', ofBlock(sBlockCasingsTT,4))
+            .addElement('1', ofBlock(sBlockCasingsTT,5))
+            .addElement('2',ofBlock(sBlockCasingsTT,8))
+            .addElement('3',ofBlock(sBlockCasingsTT,6))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_decay::addClassicToMachineList,textureOffset,1,sBlockCasingsTT,0))
+            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_decay::addElementalToMachineList,textureOffset+4,2,sBlockCasingsTT,4))
+            .build();
+
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.decay.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -110,7 +111,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0);
+        return structureCheck_EM("main", 2, 2, 0);
     }
 
     @Override
@@ -248,7 +249,7 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 2, 2, 0, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index 7d5961f219..02a049290d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -1,23 +1,21 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMDequantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.OreDictionaryStack;
-import com.github.technus.tectech.mechanics.structure.Structure;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
@@ -29,10 +27,13 @@ import java.util.ArrayList;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -41,21 +42,22 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final String[][] shape = new String[][]{
-            {"   ", " . ", "   ",},
-            {"010", "111", "010",},
-            {"\"\"\"", "\"1\"", "\"\"\"",},
-            {"121", "2!2", "121",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, QuantumGlassBlock.INSTANCE};
-    private static final byte[] blockMeta = new byte[]{0, 4, 0};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_dequantizer>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList,
-            GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList,
-            GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_dequantizer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_dequantizer>builder()
+            .addShape("main", new String[][]{
+                    {"&&&", "&~&", "&&&",},
+                    {"010", "111", "010",},
+                    {"$$$", "$1$", "$$$",},
+                    {"121", "2!2", "121",},
+            })
+            .addElement('0', ofBlock(sBlockCasingsTT, 0))
+            .addElement('1', ofBlock(sBlockCasingsTT, 4))
+            .addElement('2', ofBlockAnyMeta(QuantumGlassBlock.INSTANCE))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdder(GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList, textureOffset + 4, 2))
+            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList, textureOffset + 4, 3,sBlockCasingsTT,4))
+            .build();
+
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.emtomatter.hint.0"),//1 - Classic Hatches or High Power Casing"
@@ -92,7 +94,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
+        return structureCheck_EM("main", 1, 1, 0);
     }
 
     @Override
@@ -138,7 +140,7 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
index 82fd2df5ed..2e9a07071e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
@@ -3,20 +3,19 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import cofh.api.energy.IEnergyContainerItem;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import ic2.api.item.ElectricItem;
 import ic2.api.item.IElectricItem;
-import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -24,10 +23,12 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static gregtech.api.GregTech_API.mEUtoRF;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -35,22 +36,24 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"   ", "000", "1.1", "000", "   ",},
-            {"   ", "010", "111", "010", "   ",},
-            {"   ", "000", "111", "000", "   ",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{7, 4};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_infuser>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_infuser::addClassicToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.infuser.hint"),//1 - Classic Hatches or High Power Casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_infuser> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_infuser>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"CCC","CCC","CCC"},
+                    {"BBB","BAB","BBB"},
+                    {"A~A","AAA","AAA"},
+                    {"BBB","BAB","BBB"},
+                    {"CCC","CCC","CCC"}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 4))
+            .addElement('B', ofBlock(sBlockCasingsTT, 7))
+            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_infuser::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_infuser(int aID, String aName, String aNameRegional) {
@@ -114,7 +117,7 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 2, 0);
+        return structureCheck_EM("main", 1, 2, 0);
     }
 
     @Override
@@ -185,7 +188,12 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 1, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 1, 2, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_infuser> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index d4e85de6f9..fc465f063a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -1,8 +1,5 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputElemental;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
@@ -10,19 +7,21 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Utility;
-import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static gregtech.api.enums.GT_Values.E;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -31,32 +30,32 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final String[][] shape = new String[][]{
-            {"   ", " . ", "   ",},
-            {"000", "000", "000",},
-            {"!!!", "!0!", "!!!",},
-            {"!!!", "!!!", "!!!",},
-    };
-    private static final String[][] shapeBig = new String[][]{
-            {E, "A   ", "A . ", "A   ",},
-            {"A!!!", "!000!", "!010!", "!000!", "A!!!",},
-            {"!!!!!", "!000!", "!000!", "!000!", "!!!!!",},
-            {"A!!!", "!000!", "!000!", "!000!", "A!!!",},
-            {"A!!!", "!!!!!", "!!!!!", "!!!!!", "A!!!",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{4, 5};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_junction>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_junction::addClassicToMachineList,
-            GT_MetaTileEntity_EM_junction::addElementalToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.junction.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.junction.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_junction> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_junction>builder()
+            .addShape("main", new String[][]{
+                    {"CCC", "C~C", "CCC"},
+                    {"AAA", "AAA", "AAA"},
+                    {"DDD", "DAD", "DDD"},
+                    {"DDD", "DDD", "DDD"}
+            })
+            .addShape("mainBig", new String[][]{
+                    {"     ", " CCC ", " C~C ", " CCC ", "     "},
+                    {" DDD ", "DAAAD", "DABAD", "DAAAD", " DDD "},
+                    {"DDDDD", "DAAAD", "DAAAD", "DAAAD", "DDDDD"},
+                    {" DDD ", "DAAAD", "DAAAD", "DAAAD", " DDD "},
+                    {" DDD ", "DDDDD", "DDDDD", "DDDDD", " DDD "}
+            })
+            .addElement('A', ofBlock(sBlockCasingsTT, 4))
+            .addElement('B', ofBlock(sBlockCasingsTT, 5))
+            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_junction::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_junction::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .build();
     //endregion
 
     //region parameters
@@ -106,9 +105,9 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
         int meta = iGregTechTileEntity.getMetaIDAtSide(GT_Utility.getOppositeSide(iGregTechTileEntity.getFrontFacing()));
         if (meta == 4) {
-            return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
+            return structureCheck_EM("main", 1, 1, 0);
         } else if (meta == 5) {
-            return structureCheck_EM(shapeBig, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0);
+            return structureCheck_EM("mainBig", 2, 2, 0);
         }
         return false;
     }
@@ -177,7 +176,16 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        if ((stackSize.stackSize & 1) == 1) {
+            structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
+        } else {
+            structureBuild_EM("mainBig", 2, 2, 0, stackSize, hintsOnly);
+        }
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_junction> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index be036050be..6a840dcf0e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -2,24 +2,22 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMFluidQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMItemQuantizationInfo;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMOredictQuantizationInfo;
-import com.github.technus.tectech.mechanics.structure.Structure;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
@@ -33,13 +31,16 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.definiti
 import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refMass;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition.refUnstableMass;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullFluid;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.Util.isInputEqual;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockAnyMeta;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -48,22 +49,23 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final String[][] shape = new String[][]{
-            {"   ", " . ", "   ",},
-            {"010", "101", "010",},
-            {"\"\"\"", "\"0\"", "\"\"\"",},
-            {"202", "0!0", "202",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, QuantumGlassBlock.INSTANCE};
-    private static final byte[] blockMeta = new byte[]{4, 0, 0};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_quantizer>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_quantizer::addClassicToMachineList,
-            GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList,
-            GT_MetaTileEntity_EM_quantizer::addElementalMufflerToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4};
-    private static final String[] description = new String[]{
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_quantizer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_quantizer>builder()
+            .addShape("main", new String[][]{
+                    {"&&&", "&~&", "&&&",},
+                    {"010", "101", "010",},
+                    {"$$$", "$0$", "$$$",},
+                    {"202", "0!0", "202",},
+            })
+            .addElement('0', ofBlock(sBlockCasingsTT, 4))
+            .addElement('1', ofBlock(sBlockCasingsTT, 0))
+            .addElement('2', ofBlockAnyMeta(QuantumGlassBlock.INSTANCE))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_quantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdder(GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList, textureOffset + 4, 2))
+            .addElement('$', ofHatchAdderOptional(GT_MetaTileEntity_EM_quantizer::addElementalMufflerToMachineList, textureOffset + 4, 3,sBlockCasingsTT,4))
+            .build();
+
+    private static final String[]                                      description       = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.mattertoem.hint.1"),//2 - Elemental Output Hatch
@@ -86,14 +88,14 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
+        return structureCheck_EM("main", 1, 1, 0);
     }
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {//TODO implement instance quantization
         if (GregTech_API.sPostloadFinished) {
             ArrayList<ItemStack> storedInputs = getStoredInputs();
-            ItemStack[] inI = storedInputs.toArray(nullItem);
+            ItemStack[]          inI          = storedInputs.toArray(nullItem);
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
@@ -132,7 +134,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                 }
             }
             ArrayList<FluidStack> storedFluids = getStoredFluids();
-            FluidStack[] inF = storedFluids.toArray(nullFluid);
+            FluidStack[]          inF          = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
                     EMFluidQuantizationInfo aFQI = TecTech.transformationInfo.getFluidQuantization().get(fs.getFluid().getID());
@@ -154,7 +156,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
     private void startRecipe(IEMStack into) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
-        double mass = into.getMass();
+        double mass   = into.getMass();
         double euMult = Math.abs(mass / refMass);
         eAmpereFlow = (int) Math.ceil(Math.sqrt(Math.sqrt(euMult)));
         if (mass > refUnstableMass || into.getDefinition().getRawTimeSpan(DEFAULT_ENERGY_LEVEL) < STABLE_RAW_LIFE_TIME) {
@@ -198,7 +200,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
index 889b4cfec3..4b0294bf4d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
@@ -1,14 +1,14 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.recipe.TT_recipe;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Holder;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
@@ -22,10 +22,8 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
-import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
@@ -36,7 +34,6 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipe.E_RECIPE_ID;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
@@ -45,7 +42,10 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE
 import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.CommonValues.VN;
-import static gregtech.api.enums.GT_Values.E;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
@@ -64,32 +64,33 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
 
     private static LinkedHashMap<String, String> lServerNames;
 
-    private String clientLocale = "en_US";
-    //endregion
-
-    //region structure
-    private static final String[][] shape = new String[][]{
-            {E, "000", E, E, E, "000"/*,E,*/},
-            {"A0", "010", "A1", "A!", "A1", "010", "A0",},
-            {"A0", "010", E, E, E, "010", "A0",},
-            {"000", "010", E, E, E, "010", "000",},
-            {"000", "212", "010", "0.0", "010", "212", "000",},
-            {"000", "212", "111", "111", "111", "212", "000",},
-            {"000", "222", "   ", "   ", "   ", "222", "000",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{1, 3, 2};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_research>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_research::addClassicToMachineList,
-            GT_MetaTileEntity_EM_research::addHolderToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset + 1, textureOffset + 3};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, Blocks.air};
-    private static final byte[] blockMetaFallback = new byte[]{1, 0};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.research.hint.0"),//1 - Classic/Data Hatches or Computer casing
             translateToLocal("gt.blockmachines.multimachine.em.research.hint.1"),//2 - Holder Hatch
     };
+
+    private String clientLocale = "en_US";
+    //endregion
+
+    //region structure
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_research> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_research>builder()
+                    .addShape("main", transpose(new String[][]{
+                            {"   ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"},
+                            {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"},
+                            {"   ", " C ", "   ", "   ", "ACA", "CCC", "DDD"},
+                            {"   ", " E ", "   ", "   ", "A~A", "CCC", "DDD"},
+                            {"   ", " C ", "   ", "   ", "ACA", "CCC", "DDD"},
+                            {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"},
+                            {"   ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"}
+                    }))
+                    .addElement('A', ofBlock(sBlockCasingsTT, 1))
+                    .addElement('B', ofBlock(sBlockCasingsTT, 2))
+                    .addElement('C', ofBlock(sBlockCasingsTT, 3))
+                    .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_research::addClassicToMachineList, textureOffset + 1,1, sBlockCasingsTT,1))
+                    .addElement('E', ofHatchAdder(GT_MetaTileEntity_EM_research::addHolderToMachineList, 3, 2))
+                    .build();
     //endregion
 
     public GT_MetaTileEntity_EM_research(int aID, String aName, String aNameRegional) {
@@ -262,7 +263,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
         }
         eHolders.clear();
 
-        if (!structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 3, 4)) {
+        if (!structureCheck_EM("main", 1, 3, 4)) {
             return false;
         }
 
@@ -378,21 +379,31 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
 
         return new String[]{
                 translateToLocalFormatted("tt.keyphrase.Energy_Hatches", clientLocale) + ":",
-                EnumChatFormatting.GREEN + Long.toString(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
-                        EnumChatFormatting.YELLOW + maxEnergy + EnumChatFormatting.RESET + " EU",
+                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " +
+                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU",
                 (mEUt <= 0 ? translateToLocalFormatted("tt.keyphrase.Probably_uses", clientLocale) + ": " : translateToLocalFormatted("tt.keyphrase.Probably_makes", clientLocale) + ": ") +
-                        EnumChatFormatting.RED + Math.abs(mEUt) + EnumChatFormatting.RESET + " EU/t " + translateToLocalFormatted("tt.keyword.at", clientLocale) + " " +
-                        EnumChatFormatting.RED + eAmpereFlow + EnumChatFormatting.RESET + " A",
-                translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " + EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " + EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET +
-                        " " + translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " + EnumChatFormatting.GREEN + eMaxAmpereFlow + EnumChatFormatting.RESET + " A",
-                translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " + EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET +
-                        " " + translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
-                translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " + EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET +
-                        " " + translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " + EnumChatFormatting.BLUE + eSafeVoid,
-                translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " + EnumChatFormatting.GREEN + eAvailableData + EnumChatFormatting.RESET + " / " + EnumChatFormatting.YELLOW + eRequiredData + EnumChatFormatting.RESET,
+                        EnumChatFormatting.RED + GT_Utility.formatNumbers(Math.abs(mEUt)) + EnumChatFormatting.RESET + " EU/t " +
+                        translateToLocalFormatted("tt.keyword.at", clientLocale) + " " +
+                        EnumChatFormatting.RED + GT_Utility.formatNumbers(eAmpereFlow) + EnumChatFormatting.RESET + " A",
+                translateToLocalFormatted("tt.keyphrase.Tier_Rating", clientLocale) + ": " +
+                        EnumChatFormatting.YELLOW + VN[getMaxEnergyInputTier_EM()] + EnumChatFormatting.RESET + " / " +
+                        EnumChatFormatting.GREEN + VN[getMinEnergyInputTier_EM()] + EnumChatFormatting.RESET + " " +
+                        translateToLocalFormatted("tt.keyphrase.Amp_Rating", clientLocale) + ": " +
+                        EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eMaxAmpereFlow) + EnumChatFormatting.RESET + " A",
+                translateToLocalFormatted("tt.keyword.Problems", clientLocale) + ": " +
+                        EnumChatFormatting.RED + (getIdealStatus() - getRepairStatus()) + EnumChatFormatting.RESET + " " +
+                        translateToLocalFormatted("tt.keyword.Efficiency", clientLocale) + ": " +
+                        EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %",
+                translateToLocalFormatted("tt.keyword.PowerPass", clientLocale) + ": " +
+                        EnumChatFormatting.BLUE + ePowerPass + EnumChatFormatting.RESET + " " +
+                        translateToLocalFormatted("tt.keyword.SafeVoid", clientLocale) + ": " +
+                        EnumChatFormatting.BLUE + eSafeVoid,
+                translateToLocalFormatted("tt.keyphrase.Computation_Available", clientLocale) + ": " +
+                        EnumChatFormatting.GREEN + GT_Utility.formatNumbers(eAvailableData) + EnumChatFormatting.RESET + " / " +
+                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(eRequiredData) + EnumChatFormatting.RESET,
                 translateToLocalFormatted("tt.keyphrase.Computation_Remaining", clientLocale) + ":",
-                EnumChatFormatting.GREEN + Long.toString(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " +
-                        EnumChatFormatting.YELLOW + computationRequired / 20L
+                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(computationRemaining / 20L) + EnumChatFormatting.RESET + " / " +
+                        EnumChatFormatting.YELLOW + GT_Utility.formatNumbers(computationRequired / 20L)
         };
     }
 
@@ -559,7 +570,12 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 1, 3, 4, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 1, 3, 4, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_research> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 89255b331a..f47926b449 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -1,13 +1,10 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.recipe.TT_recipe;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
@@ -16,6 +13,8 @@ import com.github.technus.tectech.thing.item.ElementalDefinitionScanStorage_EM;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -36,7 +35,6 @@ import org.apache.commons.lang3.reflect.FieldUtils;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMPrimitiveDefinition.nbtE__;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipe.E_RECIPE_ID;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
@@ -45,6 +43,9 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.G
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.CommonValues.VN;
 import static com.github.technus.tectech.util.Util.areBitsSet;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 
@@ -54,41 +55,42 @@ import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region variables
     public static final int SCAN_DO_NOTHING = 0,
-            SCAN_GET_NOMENCLATURE = 1, SCAN_GET_DEPTH_LEVEL = 2, SCAN_GET_AMOUNT = 4, SCAN_GET_CHARGE = 8,
-            SCAN_GET_MASS = 16, SCAN_GET_ENERGY_LEVEL = 32, SCAN_GET_TIMESPAN_INFO = 64, SCAN_GET_ENERGY_STATES = 128,
-            SCAN_GET_COLOR = 256, SCAN_GET_AGE = 512, SCAN_GET_TIMESPAN_MULT = 1024, SCAN_GET_CLASS_TYPE = 2048;
+            SCAN_GET_NOMENCLATURE           = 1, SCAN_GET_DEPTH_LEVEL = 2, SCAN_GET_AMOUNT = 4, SCAN_GET_CHARGE = 8,
+            SCAN_GET_MASS                   = 16, SCAN_GET_ENERGY_LEVEL = 32, SCAN_GET_TIMESPAN_INFO = 64, SCAN_GET_ENERGY_STATES = 128,
+            SCAN_GET_COLOR                  = 256, SCAN_GET_AGE = 512, SCAN_GET_TIMESPAN_MULT = 1024, SCAN_GET_CLASS_TYPE = 2048;
 
     private TT_recipe.TT_EMRecipe.TT_EMRecipe eRecipe;
     private EMDefinitionStack                 objectResearched;
     private EMInstanceStackMap                objectsScanned;
-    private String                    machineType;
-    private long computationRemaining, computationRequired;
+    private String                            machineType;
+    private long                              computationRemaining, computationRequired;
     private int[] scanComplexity;
 
     private String clientLocale = "en_US";
     //endregion
 
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"     ", " 222 ", " 2.2 ", " 222 ", "     ",},
-            {"00000", "00000", "00000", "00000", "00000",},
-            {"00100", "01110", "11111", "01110", "00100",},
-            {"01110", "1---1", "1---1", "1---1", "01110",},
-            {"01110", "1---1", "1-A-1", "1---1", "01110",},
-            {"01110", "1---1", "1---1", "1---1", "01110",},
-            {"00100", "01110", "11\"11", "01110", "00100",},
-            {"#####", "#000#", "#0!0#", "#000#", "#####",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{4, 0, 0};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_scanner>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_scanner::addClassicToMachineList,
-            GT_MetaTileEntity_EM_scanner::addElementalInputToMachineList,
-            GT_MetaTileEntity_EM_scanner::addElementalOutputToMachineList,
-            GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4, textureOffset + 4, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4, 4, 4};
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_scanner> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_scanner>builder()
+            .addShape("main", new String[][]{
+                    {" 222 ", "2&&&2", "2&~&2", "2&&&2", " 222 ",},
+                    {"00000", "00000", "00000", "00000", "00000",},
+                    {"00100", "01110", "11111", "01110", "00100",},
+                    {"01110", "1---1", "1---1", "1---1", "01110",},
+                    {"01110", "1---1", "1-A-1", "1---1", "01110",},
+                    {"01110", "1---1", "1---1", "1---1", "01110",},
+                    {"00100", "01110", "11$11", "01110", "00100",},
+                    {"#####", "#000#", "#0!0#", "#000#", "#####",},})
+            .addElement('0', ofBlock(sBlockCasingsTT, 4))
+            .addElement('1', ofBlockAnyMeta(QuantumGlassBlock.INSTANCE))
+            .addElement('2', ofBlock(sBlockCasingsTT, 0))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('!', ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalInputToMachineList, textureOffset + 4, 2))
+            .addElement('$', ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalOutputToMachineList, textureOffset + 4, 3))
+            .addElement('#', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList, textureOffset + 4, 4, sBlockCasingsTT, 4))
+            .addElement('A', ofChain(ofBlockAnyMeta(QuantumStuffBlock.INSTANCE),isAir()))
+            .build();
+
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -99,7 +101,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     //endregion
 
     //region parameters
-    private static final INameFunction<GT_MetaTileEntity_EM_scanner> CONFIG_NAME =
+    private static final INameFunction<GT_MetaTileEntity_EM_scanner>   CONFIG_NAME   =
             (base, p) -> "Config at Depth: " + (p.hatchId() * 2 + p.parameterId());
     private static final IStatusFunction<GT_MetaTileEntity_EM_scanner> CONFIG_STATUS =
             (base, p) -> {
@@ -113,7 +115,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
                 if (v < 0) return LedStatus.STATUS_TOO_LOW;
                 return LedStatus.STATUS_OK;
             };
-    protected Parameters.Group.ParameterIn[] scanConfiguration;
+    protected            Parameters.Group.ParameterIn[]                scanConfiguration;
     //endregion
 
     public GT_MetaTileEntity_EM_scanner(int aID, String aName, String aNameRegional) {
@@ -129,9 +131,9 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     private void quantumStuff(boolean shouldExist) {
         IGregTechTileEntity base = getBaseMetaTileEntity();
         if (base != null && base.getWorld() != null) {
-            int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 4 + base.getXCoord();
-            int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 4 + base.getYCoord();
-            int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 4 + base.getZCoord();
+            int   xDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 4 + base.getXCoord();
+            int   yDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 4 + base.getYCoord();
+            int   zDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 4 + base.getZCoord();
             Block block = base.getWorld().getBlock(xDir, yDir, zDir);
             if (shouldExist) {
                 if (block != null && block.getMaterial() == Material.air) {
@@ -209,7 +211,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        if (!structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0)) {
+        if (!structureCheck_EM("main", 2, 2, 0)) {
             return false;
         }
         return eInputHatches.size() == 1 && eOutputHatches.size() == 1 && eOutputHatches.get(0).getBaseMetaTileEntity().getFrontFacing() == iGregTechTileEntity.getFrontFacing();
@@ -331,7 +333,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     @Override
     public String[] getInfoData() {
         long storedEnergy = 0;
-        long maxEnergy = 0;
+        long maxEnergy    = 0;
         for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) {
             if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
                 storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU();
@@ -409,7 +411,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         computationRemaining = aNBT.getLong("eComputationRemaining");
         computationRequired = aNBT.getLong("eComputationRequired");
         if (aNBT.hasKey("eObject")) {
-            objectResearched = EMDefinitionStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eObject"));
+            objectResearched = EMDefinitionStack.fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eObject"));
             if (objectResearched.getDefinition() == nbtE__) {
                 objectResearched = null;
             }
@@ -423,7 +425,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         }
         try {
             if (aNBT.hasKey("eScanObjects")) {
-                objectsScanned = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eScanObjects"));
+                objectsScanned = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eScanObjects"));
             }
         } catch (EMException e) {
             objectsScanned = new EMInstanceStackMap();
@@ -515,8 +517,8 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     }
 
     @Override
-    public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+    public void construct(ItemStack trigger, boolean hintsOnly) {
+        structureBuild_EM("main", 2, 2, 0, trigger, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java
index dcd85af99d..1ecd92af74 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java
@@ -1,20 +1,21 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -22,26 +23,29 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"A010", "0   0", "1 . 1", "0   0", "A010",},
-            {"23232", "32223", "22222", "32223", "23232",},
-            {"12!21", "22422", "!444!", "22422", "12!21",},
-            {"23232", "32223", "22222", "32223", "23232",},
-            {"A010", "0   0", "1   1", "0   0", "A010",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{4, 0, 5, 6, 9};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_stabilizer>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_stabilizer::addClassicToMachineList,
-            GT_MetaTileEntity_EM_stabilizer::addElementalToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_stabilizer> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_stabilizer>builder()
+            .addShape("main", transpose(new String[][]{
+                    {" AFA ","BCBCB","FBGBF","BCBCB"," AFA "},
+                    {"AEEEA","CBBBC","BBDBB","CBBBC","AEEEA"},
+                    {"FE~EF","BBBBB","GDDDG","BBBBB","FEEEF"},
+                    {"AEEEA","CBBBC","BBDBB","CBBBC","AEEEA"},
+                    {" AFA ","BCBCB","FBGBF","BCBCB"," AFA "}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 4))
+            .addElement('B', ofBlock(sBlockCasingsTT, 5))
+            .addElement('C', ofBlock(sBlockCasingsTT, 6))
+            .addElement('D', ofBlock(sBlockCasingsTT, 9))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_stabilizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('G', ofHatchAdderOptional(GT_MetaTileEntity_EM_stabilizer::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_stabilizer(int aID, String aName, String aNameRegional) {
@@ -59,7 +63,7 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0);
+        return structureCheck_EM("main", 2, 2, 0);
     }
 
     @Override
@@ -73,7 +77,12 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 2, 2, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_stabilizer> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java
index 5ade4ec965..f4e02085f4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java
@@ -1,10 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
@@ -13,24 +10,28 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Vec3Impl;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -38,22 +39,21 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"   ", " . ", "   ",},
-            {"   ", " 0 ", "   ",},
-            {"   ", "   ", "   ",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{3};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_switch>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_switch::addClassicToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset + 1};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{1};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             "1 - Classic/Data Hatches or Computer casing",//1 - Classic/Data Hatches or Computer casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_switch> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_switch>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"BBB","BBB","BBB"},
+                    {"B~B","BAB","BBB"},
+                    {"BBB","BBB","BBB"}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 3))
+            .addElement('B', ofHatchAdderOptional(GT_MetaTileEntity_EM_switch::addClassicToMachineList, textureOffset + 1, 1, sBlockCasingsTT, 1))
+            .build();
     //endregion
 
     //region parameters
@@ -99,7 +99,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 1, 0);
+        return structureCheck_EM("main", 1, 1, 0);
     }
 
     @Override
@@ -134,7 +134,10 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas
                 }
             }
 
-            Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity());
+            Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity().getXCoord(),
+                                        getBaseMetaTileEntity().getYCoord(),
+                                        getBaseMetaTileEntity().getZCoord());
+
             QuantumDataPacket pack = new QuantumDataPacket(0L).unifyTraceWith(pos);
             if (pack == null) {
                 return;
@@ -223,7 +226,12 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 1, 1, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_switch> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
index 3e288ccafa..450a8ba610 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
@@ -1,14 +1,14 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -20,12 +20,12 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
-import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sHintCasingsTT;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
 import static gregtech.api.GregTech_API.sBlockCasings1;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -46,7 +46,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
                     })
                     .addElement('0', ofBlock(sBlockCasings1,15))
                     .addElement('1', ofChain(
-                            ofHatchAdder(GT_MetaTileEntity_EM_transformer::addEnergyIOToMachineList,textureOffset,sHintCasingsTT,0),
+                            ofHatchAdder(GT_MetaTileEntity_EM_transformer::addEnergyIOToMachineList,textureOffset,1),
                             onElementPass(t->t.casingCount++,ofBlock(sBlockCasingsTT,0))
                     ))
                     .build();
@@ -160,7 +160,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        structureBuild_EM("main", 1, 1, 0, hintsOnly, stackSize);
+        structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
index fa51447e9f..98be43139b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
@@ -1,28 +1,28 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
-import static gregtech.api.enums.GT_Values.E;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -35,32 +35,33 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region structure
-    private static final String[][] shape = new String[][]{
-            {E, E, E, "C   ", "C . ", "C   "/*,E,E,E,*/},
-            {E, E, "D0", "C000", "B00100", "C000", "D0"/*,E,E,*/},
-            {E, E, "D0", "C2A2", "B0C0", "C2A2", "D0"/*,E,E,*/},
-            {E, "D0", "D0", E, "A00C00", E, "D0", "D0"/*,E,*/},
-            {E, "D0", E, E, "A0E0", E, E, "D0"/*,E,*/},
-            {"D0", "D0", E, E, "00E00", E, E, "D0", "D0",},
-            {"B00000", "A0033300", "003C300", "03E30", "03E30", "03E30", "003C300", "A0033300", "B00000",},
-            {"B0!!!0", "A 31113 ", "031222130", "!12C21!", "!12C21!", "!12C21!", "031222130", "A 31113 ", "B0!!!0",},
-            {"B0!!!0", "A 31113 ", "031444130", "!14C41!", "!14C41!", "!14C41!", "031444130", "A 31113 ", "B0!!!0",},
-            {"B0!!!0", "A 31113 ", "031222130", "!12C21!", "!12C21!", "!12C21!", "031222130", "A 31113 ", "B0!!!0",},
-            {"B00000", "A0033300", "003C300", "03E30", "03E30", "03E30", "003C300", "A0033300", "B00000",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{12, 10, 0, 5, 11};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_wormhole>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_wormhole::addClassicToMachineList,
-            GT_MetaTileEntity_EM_wormhole::addElementalToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_wormhole> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_EM_wormhole>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"         ","         ","         ","         ","         ","    D    ","  DDDDD  ","  DGGGD  ","  DGGGD  ","  DGGGD  ","  DDDDD  "},
+                    {"         ","         ","         ","    D    ","    D    ","    D    "," DDAAADD "," EABBBAE "," EABBBAE "," EABBBAE "," DDAAADD "},
+                    {"         ","    D    ","    D    ","    D    ","         ","         ","DDA   ADD","DABFFFBAD","DABCCCBAD","DABFFFBAD","DDA   ADD"},
+                    {"   EEE   ","   DDD   ","   F F   ","         ","         ","         ","DA     AD","GBF   FBG","GBC   CBG","GBF   FBG","DA     AD"},
+                    {"   E~E   ","  DDBDD  ","  D   D  "," DD   DD "," D     D ","DD     DD","DA     AD","GBF   FBG","GBC   CBG","GBF   FBG","DA     AD"},
+                    {"   EEE   ","   DDD   ","   F F   ","         ","         ","         ","DA     AD","GBF   FBG","GBC   CBG","GBF   FBG","DA     AD"},
+                    {"         ","    D    ","    D    ","    D    ","         ","         ","DDA   ADD","DABFFFBAD","DABCCCBAD","DABFFFBAD","DDA   ADD"},
+                    {"         ","         ","         ","    D    ","    D    ","    D    "," DDAAADD "," EABBBAE "," EABBBAE "," EABBBAE "," DDAAADD "},
+                    {"         ","         ","         ","         ","         ","    D    ","  DDDDD  ","  DGGGD  ","  DGGGD  ","  DGGGD  ","  DDDDD  "}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 5))
+            .addElement('B', ofBlock(sBlockCasingsTT, 10))
+            .addElement('C', ofBlock(sBlockCasingsTT, 11))
+            .addElement('D', ofBlock(sBlockCasingsTT, 12))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_wormhole::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('G', ofHatchAdderOptional(GT_MetaTileEntity_EM_wormhole::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_wormhole(int aID, String aName, String aNameRegional) {
@@ -78,7 +79,7 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 4, 4, 0);
+        return structureCheck_EM("main", 4, 4, 0);
     }
 
     @Override
@@ -108,7 +109,12 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 4, 4, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 4, 4, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_EM_wormhole> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
index 674ffe8c3e..7dd4d0067c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
@@ -1,20 +1,19 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.Reference;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Vec3Impl;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
-import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
@@ -27,10 +26,12 @@ import java.util.ArrayList;
 import java.util.HashSet;
 
 import static com.github.technus.tectech.loader.MainLoader.microwaving;
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static gregtech.api.GregTech_API.sBlockCasings4;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.AxisAlignedBB.getBoundingBox;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -44,26 +45,23 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
 
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final String[][] shape = new String[][]{
-            {"00000", "00000", "00.00", "0   0",},
-            {"0---0", "0---0", "0---0", " 000 ",},
-            {"0---0", "0---0", "0---0", " 000 ",},
-            {"0---0", "0---0", "0---0", " 000 ",},
-            {"00000", "00000", "00000", "0   0",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasings4};
-    private static final byte[] blockMeta = new byte[]{1};
-
-    private static final IHatchAdder<GT_MetaTileEntity_TM_microwave>[] addingMethods = adders(
-            GT_MetaTileEntity_TM_microwave::addClassicToMachineList);
-    private static final short[] casingTextures = new short[]{49};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasings4};
-    private static final byte[] blockMetaFallback = new byte[]{1};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.0"),//1 - Classic Hatches or Clean Stainless Steel Casing
             translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.1"),//Also acts like a hopper so give it an Output Bus
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_TM_microwave> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_TM_microwave>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"AAAAA","A---A","A---A","A---A","AAAAA"},
+                    {"AAAAA","A---A","A---A","A---A","AAAAA"},
+                    {"AA~AA","A---A","A---A","A---A","AAAAA"},
+                    {"ABBBA","BAAAB","BAAAB","BAAAB","ABBBA"}
+            }))
+            .addElement('A', ofBlock(sBlockCasings4, 1))
+            .addElement('B', ofHatchAdderOptional(GT_MetaTileEntity_TM_microwave::addClassicToMachineList, 49, 1, sBlockCasings4, 1))
+            .build();
     //endregion
 
     //region parameters
@@ -101,7 +99,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 0);
+        return  structureCheck_EM("main", 2, 2, 0);
     }
 
     @Override
@@ -249,7 +247,12 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 2, 2, 0, stackSize, hintsOnly);
+    }
+
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_TM_microwave> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java
index 38e14b9a6f..427f448e2a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java
@@ -1,27 +1,32 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi;
 
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
-import com.github.technus.tectech.util.CommonValues;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.ITexture;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.block.Block;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
-import static gregtech.api.GregTech_API.sBlockCasings4;
-import static net.minecraft.util.StatCollector.translateToLocal;
 
+@Deprecated
 public class GT_MetaTileEntity_TM_proccessingStack extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
+    protected GT_MetaTileEntity_TM_proccessingStack(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    @Override
+    public void construct(ItemStack stackSize, boolean hintsOnly) {
+
+    }
+
+    @Override
+    public String[] getStructureDescription(ItemStack stackSize) {
+        return new String[0];
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return null;
+    }
+    /*
     //region variables
     private boolean hasBeenPausedThisCycle = false;
     //endregion
@@ -131,4 +136,5 @@ public class GT_MetaTileEntity_TM_proccessingStack extends GT_MetaTileEntity_Mul
     public String[] getStructureDescription(ItemStack stackSize) {
         return description;
     }
+ */
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index c2f475888f..61e912e8d1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -2,11 +2,8 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.loader.NetworkDispatcher;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.spark.RendererMessage;
 import com.github.technus.tectech.mechanics.spark.ThaumSpark;
-import com.github.technus.tectech.mechanics.structure.Structure;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.tesla.ITeslaConnectable;
 import com.github.technus.tectech.mechanics.tesla.ITeslaConnectableSimple;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Capacitor;
@@ -19,10 +16,12 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Vec3Impl;
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.MultimapBuilder;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.structure.StructureDefinition;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Materials;
@@ -31,7 +30,6 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.*;
-import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -41,14 +39,15 @@ import net.minecraftforge.fluids.FluidStack;
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.*;
+import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsBA0;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static gregtech.api.enums.GT_Values.E;
-import static java.lang.Math.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.*;
+import static java.lang.Math.min;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable, ITeslaConnectable {
@@ -100,35 +99,44 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     //endregion
 
     //region structure
-    private static final String[][] shape = new String[][]{//3 16 0
-            {"\u000F", "A  .  ",},
-            {E, "B000", "B000", "B000", "\u0001", "B000", E, "B000", E, "B000", E, "B000", "\u0001", "B111", " 22222 ",},
-            {"B000", "A00000", "A00000", "A00000", "B000", E, "A0A!A0", E, "A0A!A0", E, "A0A!A0", E, "A0A!A0", "\u0001", "A1C1", " 21112 ",},
-            {"B000", "A00000", "A00000", "A00000", "B030", "C3", "A0!3!0", "C3", "A0!3!0", "C3", "A0!3!0", "C3", "A0!3!0", "C3", "C3", "A1A3A1", " 21212 ",},
-            {"B000", "A00000", "A00000", "A00000", "B000", E, "A0A!A0", E, "A0A!A0", E, "A0A!A0", E, "A0A!A0", "\u0001", "A1C1", " 21112 ",},
-            {E, "B000", "B000", "B000", "\u0001", "B000", E, "B000", E, "B000", E, "B000", "\u0001", "B111", " 22222 ",},
-            {"\u000F", "A     ",},
-    };
-    private static final Block[] blockType = new Block[]{sBlockCasingsBA0, sBlockCasingsBA0, sBlockCasingsBA0, sBlockCasingsBA0};
-    private static final byte[] blockMetaT0 = new byte[]{7, 0, 6, 8};
-    private static final byte[] blockMetaT1 = new byte[]{7, 1, 6, 8};
-    private static final byte[] blockMetaT2 = new byte[]{7, 2, 6, 8};
-    private static final byte[] blockMetaT3 = new byte[]{7, 3, 6, 8};
-    private static final byte[] blockMetaT4 = new byte[]{7, 4, 6, 8};
-    private static final byte[] blockMetaT5 = new byte[]{7, 5, 6, 8};
-    private static final byte[] blockMetaT6 = new byte[]{7, 9, 6, 8};
-    private static final byte[][] blockMetas = new byte[][]{blockMetaT0, blockMetaT1, blockMetaT2, blockMetaT3, blockMetaT4, blockMetaT5, blockMetaT6};
-    private static final IHatchAdder<GT_MetaTileEntity_TM_teslaCoil>[] addingMethods = adders(
-            GT_MetaTileEntity_TM_teslaCoil::addCapacitorToMachineList,
-            GT_MetaTileEntity_TM_teslaCoil::addFrameToMachineList);
-    private static final short[] casingTextures = new short[]{(texturePage << 7) + 16 + 6, 0};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsBA0, null};
-    private static final byte[] blockMetaFallback = new byte[]{6, 0};
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.0"),//1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing
-            translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.1"),//2 - Titanium Frames
     };
+
+    private static final IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> STRUCTURE_DEFINITION =
+            StructureDefinition.<GT_MetaTileEntity_TM_teslaCoil>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"       ","       ","  BBB  ","  BBB  ","  BBB  ","       ","       "},
+                    {"       ","  BBB  "," BBBBB "," BBBBB "," BBBBB ","  BBB  ","       "},
+                    {"       ","  BBB  "," BBBBB "," BBBBB "," BBBBB ","  BBB  ","       "},
+                    {"       ","  BBB  "," BBBBB "," BBBBB "," BBBBB ","  BBB  ","       "},
+                    {"       ","       ","  BBB  ","  BCB  ","  BBB  ","       ","       "},
+                    {"       ","       ","       ","   C   ","       ","       ","       "},
+                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
+                    {"       ","       ","       ","   C   ","       ","       ","       "},
+                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
+                    {"       ","       ","       ","   C   ","       ","       ","       "},
+                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
+                    {"       ","       ","       ","   C   ","       ","       ","       "},
+                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
+                    {"       ","       ","       ","   C   ","       ","       ","       "},
+                    {"       ","       ","       ","   C   ","       ","       ","       "},
+                    {"       ","  DDD  "," D   D "," D C D "," D   D ","  DDD  ","       "},
+                    {" EE~EE ","EAAAAAE","EADDDAE","EADADAE","EADDDAE"," AAAAAE"," EEEEE "}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsBA0, 6))
+            .addElement('B', ofBlock(sBlockCasingsBA0, 7))
+            .addElement('C', ofBlock(sBlockCasingsBA0, 8))
+            .addElement('D', defer(t -> ofBlock(sBlockCasingsBA0, t.getCoilWindingMeta())))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_TM_teslaCoil::addCapacitorToMachineList, textureOffset + 16 + 6, 1, sBlockCasingsBA0, 6))
+            .addElement('F', ofFrame(Materials.get("Titanium")))
+            .build();
+
+    public int getCoilWindingMeta() {
+        Vec3Impl xyzOffsets = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -1, 1));
+        return this.getBaseMetaTileEntity().getMetaIDOffset(xyzOffsets.get0(), xyzOffsets.get1(), xyzOffsets.get2());
+    }
     //endregion
 
     //region parameters
@@ -348,7 +356,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
             mTier = 6;
         }//Hacky remap because the ZPM coils were added later
 
-        if (structureCheck_EM(shape, blockType, blockMetas[mTier], addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 3, 16, 0) && eCapacitorHatches.size() > 0) {
+        if (structureCheck_EM("main", 3, 16, 0)) {
             for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) {
                 if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) {
                     cap.getBaseMetaTileEntity().setActive(iGregTechTileEntity.isActive());
@@ -360,11 +368,15 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
                 oldRotation = (byte) getExtendedFacing().ordinal();
                 oldOrientation = iGregTechTileEntity.getFrontFacing();
 
+                Vec3Impl posBMTE = new Vec3Impl(getBaseMetaTileEntity().getXCoord(),
+                                                getBaseMetaTileEntity().getYCoord(),
+                                                getBaseMetaTileEntity().getZCoord());
+
                 //Calculate coordinates of the middle bottom
-                posTop = getExtendedFacing().getWorldOffset(new Vec3Impl(0, 0, 2)).add(getBaseMetaTileEntity());
+                posTop = getExtendedFacing().getWorldOffset(new Vec3Impl(0, 0, 2)).add(posBMTE);
 
                 //Calculate coordinates of the top sphere
-                posTop = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -14, 2)).add(getBaseMetaTileEntity());
+                posTop = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -14, 2)).add(posBMTE);
             }
             return true;
         }
@@ -680,9 +692,14 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         return aTileEntity != null && aTileEntity.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame;
     }
 
+    @Override
+    public IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> getStructure_EM() {
+        return STRUCTURE_DEFINITION;
+    }
+
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMetas[(stackSize.stackSize - 1) % 7], 3, 16, 0, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 3, 16, 0, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 2fe43cb8e1..be1f0e699b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -2,25 +2,21 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.base;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.loader.NetworkDispatcher;
-import com.github.technus.tectech.mechanics.alignment.AlignmentLimits;
-import com.github.technus.tectech.mechanics.alignment.AlignmentMessage;
-import com.github.technus.tectech.mechanics.alignment.IAlignment;
-import com.github.technus.tectech.mechanics.alignment.IAlignmentLimits;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Flip;
-import com.github.technus.tectech.mechanics.alignment.enumerable.Rotation;
+import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.Structure;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.util.Vec3Impl;
+import com.gtnewhorizon.structurelib.StructureLibAPI;
+import com.gtnewhorizon.structurelib.alignment.IAlignment;
+import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
+import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
+import com.gtnewhorizon.structurelib.alignment.enumerable.Flip;
+import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -33,7 +29,6 @@ import gregtech.api.metatileentity.implementations.*;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Pollution;
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -144,8 +139,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     private boolean explodedThisTick = false;
 
     //front rotation val
-    private IAlignmentLimits alignmentLimits = AlignmentLimits.UNLIMITED;
-    private ExtendedFacing extendedFacing = ExtendedFacing.DEFAULT;
+    private IAlignmentLimits alignmentLimits = IAlignmentLimits.UNLIMITED;
+    private ExtendedFacing   extendedFacing  = ExtendedFacing.DEFAULT;
     //endregion
 
     protected GT_MetaTileEntity_MultiblockBase_EM(int aID, String aName, String aNameRegional) {
@@ -175,9 +170,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
             IGregTechTileEntity base = getBaseMetaTileEntity();
             mMachine = false;
             if (getBaseMetaTileEntity().isServerSide()) {
-                NetworkDispatcher.INSTANCE.sendToAllAround(new AlignmentMessage.AlignmentData(this),
-                        base.getWorld().provider.dimensionId,
-                        base.getXCoord(), base.getYCoord(), base.getZCoord(), 512);
+                StructureLibAPI.sendAlignment(this,getBaseMetaTileEntity().getWorld());
             }else{
                 base.issueTextureUpdate();
             }
@@ -189,11 +182,6 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
         return alignmentLimits;
     }
 
-    @Override
-    public void setAlignmentLimits(IAlignmentLimits limits) {
-        alignmentLimits=limits;
-    }
-
     @Override
     public boolean isFacingValid(byte aFacing) {
         return canSetToDirectionAny(ForgeDirection.getOrientation(aFacing));
@@ -224,28 +212,13 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                 horizontalOffset,verticalOffset,depthOffset,!mMachine);
     }
 
-    public final boolean structureBuild_EM(String piece,int horizontalOffset, int verticalOffset, int depthOffset,boolean hintsOnly,ItemStack trigger) {
+    public final boolean structureBuild_EM(String piece, int horizontalOffset, int verticalOffset, int depthOffset, ItemStack trigger, boolean hintsOnly) {
         IGregTechTileEntity baseMetaTileEntity = getBaseMetaTileEntity();
         return getStructure_EM_Internal().buildOrHints(this, trigger, piece, baseMetaTileEntity.getWorld(),
                 getExtendedFacing(), baseMetaTileEntity.getXCoord(), baseMetaTileEntity.getYCoord(),
                 baseMetaTileEntity.getZCoord(), horizontalOffset, verticalOffset, depthOffset, hintsOnly);
     }
 
-    @Deprecated
-    @SuppressWarnings("unchecked")
-    public final <T extends GT_MetaTileEntity_MultiblockBase_EM> boolean structureCheck_EM(
-            String[][] structure,//0-9 casing, +- air no air, a-z ignore
-            Block[] blockType,//use numbers 0-9 for casing types
-            byte[] blockMeta,//use numbers 0-9 for casing types
-            IHatchAdder<T>[] addingMethods,
-            short[] casingTextures,
-            Block[] blockTypeFallback,//use numbers 0-9 for casing types
-            byte[] blockMetaFallback,//use numbers 0-9 for casing types
-            int horizontalOffset, int verticalOffset, int depthOffset) {
-        return Structure.checker(structure, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback,
-                horizontalOffset, verticalOffset, depthOffset, (T)this, getExtendedFacing(), !mMachine);
-    }
-
     //endregion
 
     //region METHODS TO OVERRIDE - general functionality, recipe check, output
@@ -648,7 +621,8 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
      */
     protected long getAvailableData_EM() {
         long result = 0;
-        Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity());
+        IGregTechTileEntity baseMetaTileEntity = getBaseMetaTileEntity();
+        Vec3Impl pos = new Vec3Impl(baseMetaTileEntity.getXCoord(),baseMetaTileEntity.getYCoord(),baseMetaTileEntity.getZCoord());
         for (GT_MetaTileEntity_Hatch_InputData in : eInputData) {
             if (in.q != null) {
                 Long value = in.q.contentIfNotInTrace(pos);
@@ -1095,7 +1069,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
     public final void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         isFacingValid(aBaseMetaTileEntity.getFrontFacing());
         if (getBaseMetaTileEntity().isClientSide()) {
-            NetworkDispatcher.INSTANCE.sendToServer(new AlignmentMessage.AlignmentQuery(this));
+            StructureLibAPI.queryAlignment(this);
         }
         onFirstTick_EM(aBaseMetaTileEntity);
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java
index 44bfa4445d..5ed53634de 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/render/TT_RenderedExtendedFacingTexture.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.base.render;
 
-import com.github.technus.tectech.mechanics.alignment.IAlignmentProvider;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
 import com.github.technus.tectech.util.LightingHelper;
+import com.gtnewhorizon.structurelib.alignment.IAlignmentProvider;
+import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IColorModulationContainer;
 import gregtech.api.interfaces.IIconContainer;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
index cf8f26ff02..f7f37729d3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
@@ -3,19 +3,15 @@ package com.github.technus.tectech.thing.metaTileEntity.multi.em_collider;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMComplexAspectDefinition;
 import com.github.technus.tectech.compatibility.thaumcraft.elementalMatter.definitions.EMPrimalAspectDefinition;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.decay.EMDecayResult;
-import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMDefinitionStackMap;
+import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
-import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.EMPrimitiveTemplate;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMHadronDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
-import com.github.technus.tectech.mechanics.structure.IStructureDefinition;
-import com.github.technus.tectech.mechanics.structure.StructureDefinition;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
-import com.github.technus.tectech.thing.casing.TT_Container_Casings;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputElemental;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction;
@@ -23,6 +19,9 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunctio
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
+import com.gtnewhorizon.structurelib.StructureLibAPI;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -39,12 +38,13 @@ import java.util.HashMap;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
-import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.github.technus.tectech.util.DoubleCount.add;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -59,7 +59,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     protected static final byte FUSE_MODE = 0, COLLIDE_MODE = 1;
     private static double MASS_TO_EU_INSTANT;
-    private static int STARTUP_COST, KEEPUP_COST;
+    private static int    STARTUP_COST, KEEPUP_COST;
 
     protected byte            eTier = 0;
     protected EMInstanceStack stack;
@@ -69,7 +69,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region collision handlers
-    public static final HashMap<Long, IColliderHandler> FUSE_HANDLERS = new HashMap<>();
+    public static final HashMap<Long, IColliderHandler>            FUSE_HANDLERS           = new HashMap<>();
     public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
 
     static {
@@ -263,7 +263,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region parameters
-    protected Parameters.Group.ParameterIn mode;
+    protected            Parameters.Group.ParameterIn                   mode;
     private static final IStatusFunction<GT_MetaTileEntity_EM_collider> MODE_STATUS = (base_EM, p) -> {
         if (base_EM.isMaster()) {
             double mode = p.get();
@@ -278,7 +278,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         }
         return STATUS_OK;
     };
-    private static final INameFunction<GT_MetaTileEntity_EM_collider> MODE_NAME = (base_EM, p) -> {
+    private static final INameFunction<GT_MetaTileEntity_EM_collider>   MODE_NAME   = (base_EM, p) -> {
         if (base_EM.isMaster()) {
             double mode = p.get();
             if (mode == FUSE_MODE) {
@@ -294,30 +294,30 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = StructureDefinition
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = IStructureDefinition
             .<GT_MetaTileEntity_EM_collider>builder()
-            .addShapeOldApi("main", new String[][]{
-                    {"I0A0A0", "I00000", "I0A0A0",},
-                    {"H0000000", "G001111100", "H0000000",},
-                    {"F22223332222", "F41155555114", "F22223332222",},
-                    {"E2000000000002", "E4155111115514", "E2000000000002",},
-                    {"D20000E00002", "D41511E11514", "D20000E00002",},
-                    {"C2000I0002", "C4151I1514", "C2000I0002",},
-                    {"B2000K0002", "B4151K1514", "B2000K0002",},
-                    {"B200M002", "A0151M1510", "B200M002",},
-                    {"A0200M0020", "A0151M1510", "A0200M0020",},
-                    {"0020O0200", "0151O1510", "0020O0200",},
-                    {"A030O030", "0151O1510", "A030O030",},
-                    {"0030O0300", "0151O1510", "0030O0300",},
-                    {"A030O030", "0151O1510", "A030O030",},
-                    {"0020O0200", "0151O1510", "0020O0200",},
-                    {"A0200M0020", "A0151M1510", "A0200M0020",},
-                    {"B200M002", "A0151M1510", "B200M002",},
-                    {"B2000K0002", "B4151K1514", "B2000K0002",},
-                    {"C2000I0002", "C4151I1514", "C2000I0002",},
-                    {"D200002&&&200002", "D415112&.&211514", "D200002&&&200002",},
-                    {"E20!!22222!!02", "E4155111115514", "E20!!22222!!02",},
-                    {"F2222#$#2222", "F41155555114", "F2222#$#2222",},
+            .addShape("main", new String[][]{
+                    {"         0 0 0         ", "         00000         ", "         0 0 0         ",},
+                    {"        0000000        ", "       001111100       ", "        0000000        ",},
+                    {"      22223332222      ", "      41155555114      ", "      22223332222      ",},
+                    {"     2000000000002     ", "     4155111115514     ", "     2000000000002     ",},
+                    {"    20000     00002    ", "    41511     11514    ", "    20000     00002    ",},
+                    {"   2000         0002   ", "   4151         1514   ", "   2000         0002   ",},
+                    {"  2000           0002  ", "  4151           1514  ", "  2000           0002  ",},
+                    {"  200             002  ", " 0151             1510 ", "  200             002  ",},
+                    {" 0200             0020 ", " 0151             1510 ", " 0200             0020 ",},
+                    {"0020               0200", "0151               1510", "0020               0200",},
+                    {" 030               030 ", "0151               1510", " 030               030 ",},
+                    {"0030               0300", "0151               1510", "0030               0300",},
+                    {" 030               030 ", "0151               1510", " 030               030 ",},
+                    {"0020               0200", "0151               1510", "0020               0200",},
+                    {" 0200             0020 ", " 0151             1510 ", " 0200             0020 ",},
+                    {"  200             002  ", " 0151             1510 ", "  200             002  ",},
+                    {"  2000           0002  ", "  4151           1514  ", "  2000           0002  ",},
+                    {"   2000         0002   ", "   4151         1514   ", "   2000         0002   ",},
+                    {"    200002&&&200002    ", "    415112&~&211514    ", "    200002&&&200002    ",},
+                    {"     20!!22222!!02     ", "     4155111115514     ", "     20!!22222!!02     ",},
+                    {"      2222#$#2222      ", "      41155555114      ", "      2222#$#2222      ",},
             })
             .addElement('0', ofBlock(sBlockCasingsTT, 4))
             .addElement('1', ofBlock(sBlockCasingsTT, 7))
@@ -337,7 +337,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             .addElement('#', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList,
                     textureOffset + 4, 4, sBlockCasingsTT, 4))
             .build();
-    private static final String[] description = new String[]{
+    private static final String[]                                            description          = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.collider.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.collider.hint.1"),//2 - Elemental Input Hatches or Molecular Casing
@@ -362,7 +362,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     public static void setValues(int heliumPlasmaValue) {
-        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07* EM_COUNT_PER_MATERIAL_AMOUNT);//mass diff
+        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07 * EM_COUNT_PER_MATERIAL_AMOUNT);//mass diff
         MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20;
         STARTUP_COST = -heliumPlasmaValue * 10000;
         KEEPUP_COST = -heliumPlasmaValue;
@@ -374,7 +374,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                     partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
 
             EMInstanceStack stack2  = partner.stack;
-            double          preMass = add(stack2.getMass(),stack.getMass());
+            double          preMass = add(stack2.getMass(), stack.getMass());
             //System.out.println("preMass = " + preMass);
 
             EMInstanceStackMap map = new EMInstanceStackMap();
@@ -438,10 +438,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     protected GT_MetaTileEntity_EM_collider getPartner() {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        IGregTechTileEntity iGregTechTileEntity    = getBaseMetaTileEntity();
+        int                 xDir                   = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int                 yDir                   = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int                 zDir                   = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
         IGregTechTileEntity gregTechBaseTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir);
         if (gregTechBaseTileEntity != null) {
             IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity();
@@ -652,7 +652,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         eTier = aNBT.getByte("eTier");//collider tier
         started = aNBT.getBoolean("eStarted");
         if (aNBT.hasKey("eStack")) {
-            stack = EMInstanceStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eStack"));
+            stack = EMInstanceStack.fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eStack"));
         }
         plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
     }
@@ -689,17 +689,17 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
         IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        int                 xDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int                 yDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int                 zDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
         if (hintsOnly) {
             TecTech.proxy.hint_particle(iGregTechTileEntity.getWorld(),
                     iGregTechTileEntity.getXCoord() + xDir,
                     iGregTechTileEntity.getYCoord() + yDir,
                     iGregTechTileEntity.getZCoord() + zDir,
-                    TT_Container_Casings.sHintCasingsTT, 12);
+                    StructureLibAPI.getBlockHint(), 12);
         }
-        structureBuild_EM("main", 11, 1, 18, hintsOnly, stackSize);
+        structureBuild_EM("main", 11, 1, 18, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index e653c1a357..2735f207e4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -1,15 +1,14 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.em_machine;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.constructable.IConstructable;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
-import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.block.QuantumStuffBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
+import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
+import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
@@ -23,10 +22,12 @@ import net.minecraftforge.common.util.ForgeDirection;
 import java.util.HashMap;
 import java.util.function.Supplier;
 
-import static com.github.technus.tectech.mechanics.structure.Structure.adders;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.isAir;
+import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -41,22 +42,25 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
     //endregion
 
     //region structure
-    private static final String[][] shape = new String[][]{
-            {"B0", "A   ", "0 - 0", "A   ", "B0",},
-            {"A000", "00000", "00.00", "00000", "A000",},
-            {"A121", "1---1", "2---2", "1---1", "A121",},
-            {"A131", "1---1", "3-A-3", "1---1", "A131",},
-            {"A121", "1---1", "2---2", "1---1", "A121",},
-            {"A000", "00000", "00-00", "00000", "A000",},
-            {"B0", "A!!!", "0!!!0", "A!!!", "B0",},};
-    private static final Block[] blockType = new Block[]{sBlockCasingsTT, QuantumGlassBlock.INSTANCE, sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMeta = new byte[]{4, 0, 5, 6};
-    private static final IHatchAdder<GT_MetaTileEntity_EM_machine>[] addingMethods = adders(
-            GT_MetaTileEntity_EM_machine::addClassicToMachineList,
-            GT_MetaTileEntity_EM_machine::addElementalToMachineList);
-    private static final short[] casingTextures = new short[]{textureOffset, textureOffset + 4};
-    private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT};
-    private static final byte[] blockMetaFallback = new byte[]{0, 4};
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_machine> STRUCTURE_DEFINITION=IStructureDefinition
+            .<GT_MetaTileEntity_EM_machine>builder()
+            .addShape("main",new String[][]{
+                    {"  0  ", " &&& ", "0& &0", " &&& ", "  0"  ,},
+                    {" 000 ", "00000", "00~00", "00000", " 000 ",},
+                    {" 121 ", "1---1", "2---2", "1---1", " 121 ",},
+                    {" 131 ", "1---1", "3-A-3", "1---1", " 131 ",},
+                    {" 121 ", "1---1", "2---2", "1---1", " 121 ",},
+                    {" 000 ", "00000", "00-00", "00000", " 000" ,},
+                    {"  0  ", " !!! ", "0!!!0", " !!! ", "  0  ",},})
+            .addElement('0', ofBlock(sBlockCasingsTT,4))
+            .addElement('1',ofBlockAnyMeta(QuantumGlassBlock.INSTANCE))
+            .addElement('2',ofBlock(sBlockCasingsTT,5))
+            .addElement('3',ofBlock(sBlockCasingsTT,6))
+            .addElement('&', ofHatchAdderOptional(GT_MetaTileEntity_EM_machine::addClassicToMachineList,textureOffset,1,sBlockCasingsTT,0))
+            .addElement('!', ofHatchAdderOptional(GT_MetaTileEntity_EM_machine::addElementalToMachineList,textureOffset+4,2,sBlockCasingsTT,4))
+            .addElement('A', ofChain(ofBlockAnyMeta(QuantumStuffBlock.INSTANCE),isAir()))
+            .build();
+
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.processing.hint.0"),//1 - Classic Hatches or High Power Casing
@@ -190,7 +194,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 2, 2, 1);
+        return structureCheck_EM("main", 2, 2, 1);
     }
 
     @Override
@@ -354,7 +358,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        Structure.builder(shape, blockType, blockMeta, 2, 2, 1, getBaseMetaTileEntity(), getExtendedFacing(), hintsOnly);
+        structureBuild_EM("main", 2, 2, 1, stackSize, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
index d942786916..748b680faa 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
@@ -272,11 +272,11 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
                 int time=itemStack.stackTagCompound.getInteger("time");
                 int EUt=itemStack.stackTagCompound.getInteger("eu");
                 font.drawString("Assembly Line Recipe", 7, 8, 0x80a0ff);
-                font.drawString(GT_Utility.trans("152","Total: ") + ((long)time * EUt) + " EU",7,93, 0x80a0ff);
-                font.drawString(GT_Utility.trans("153","Usage: ") + EUt + " EU/t",7,103, 0x80a0ff);
-                font.drawString(GT_Utility.trans("154","Voltage: ") + EUt + " EU",7,113, 0x80a0ff);
+                font.drawString(GT_Utility.trans("152","Total: ") + GT_Utility.formatNumbers((long)time * EUt) + " EU",7,93, 0x80a0ff);
+                font.drawString(GT_Utility.trans("153","Usage: ") + GT_Utility.formatNumbers(EUt) + " EU/t",7,103, 0x80a0ff);
+                font.drawString(GT_Utility.trans("154","Voltage: ") + GT_Utility.formatNumbers(EUt) + " EU",7,113, 0x80a0ff);
                 font.drawString(GT_Utility.trans("155","Amperage: ") + 1 ,7,123, 0x80a0ff);
-                font.drawString( GT_Utility.trans("158","Time: ")+String.format("%.2f " + GT_Utility.trans("161"," secs"), 0.05F * time), 7,133, 0x80a0ff);
+                font.drawString( GT_Utility.trans("158","Time: ") + GT_Utility.formatNumbers(0.05d * time) + GT_Utility.trans("161"," secs"), 7,133, 0x80a0ff);
 
                 for(Map.Entry<GT_Slot_Holo,ItemStack> entry:slots.entrySet()){
                     gui.renderItemSimple(entry.getKey(),entry.getValue());
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
index 3b194c516b..01d5e2321e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
@@ -1,12 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.mechanics.alignment.enumerable.ExtendedFacing;
-import com.github.technus.tectech.mechanics.structure.StructureUtility;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_DebugStructureWriter;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_DebugStructureWriter;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.util.Util;
+import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
+import com.gtnewhorizon.structurelib.structure.StructureUtility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -20,9 +20,13 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.Comparator;
+import java.util.function.Function;
+
 import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -115,11 +119,18 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (aBaseMetaTileEntity.isAllowedToWork()) {
-            String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(),
-                    ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())),
+//            String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(),
+//                    ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())),
+//                    aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord(),
+//                    numbers[0], numbers[1], numbers[2],
+//                    numbers[3], numbers[4], numbers[5],false);
+            String pseudoJavaCode = StructureUtility.getPseudoJavaCode(
+                    aBaseMetaTileEntity.getWorld(), ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())),
                     aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord(),
                     numbers[0], numbers[1], numbers[2],
-                    numbers[3], numbers[4], numbers[5],false);
+                    te -> te.getClass().getCanonicalName(),
+                    numbers[3], numbers[4], numbers[5],
+                    false);
             TecTech.LOGGER.info(pseudoJavaCode);
             result = pseudoJavaCode.split("\\n");
             aBaseMetaTileEntity.disableWorking();
@@ -129,11 +140,18 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti
     @Override
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         IGregTechTileEntity aBaseMetaTileEntity = getBaseMetaTileEntity();
-        String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(),
-                ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())),
+//        String pseudoJavaCode = StructureUtility.getPseudoJavaCode(aBaseMetaTileEntity.getWorld(),
+//                ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())),
+//                aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord(),
+//                numbers[0], numbers[1], numbers[2],
+//                numbers[3], numbers[4], numbers[5],true);
+        String pseudoJavaCode = StructureUtility.getPseudoJavaCode(
+                aBaseMetaTileEntity.getWorld(), ExtendedFacing.of(ForgeDirection.getOrientation(aBaseMetaTileEntity.getFrontFacing())),
                 aBaseMetaTileEntity.getXCoord(), aBaseMetaTileEntity.getYCoord(), aBaseMetaTileEntity.getZCoord(),
                 numbers[0], numbers[1], numbers[2],
-                numbers[3], numbers[4], numbers[5],true);
+                te -> te.getClass().getCanonicalName(),
+                numbers[3], numbers[4], numbers[5],
+                false);
         TecTech.LOGGER.info(pseudoJavaCode);
         result = pseudoJavaCode.split("\\n");
         aBaseMetaTileEntity.disableWorking();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
index 274389b01a..3b240e4c56 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
@@ -8,10 +8,10 @@ import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.spark.RendererMessage;
 import com.github.technus.tectech.mechanics.spark.ThaumSpark;
 import com.github.technus.tectech.util.Util;
-import com.github.technus.tectech.util.Vec3Impl;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.MultimapBuilder;
+import com.gtnewhorizon.structurelib.util.Vec3Impl;
 import eu.usrv.yamcore.auxiliary.PlayerChatHelper;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -333,7 +333,9 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
 
     @Override
     public Vec3Impl getTeslaPosition() {
-        return new Vec3Impl(this.getBaseMetaTileEntity());
+        return new Vec3Impl(this.getBaseMetaTileEntity().getXCoord(),
+                            this.getBaseMetaTileEntity().getYCoord(),
+                            this.getBaseMetaTileEntity().getZCoord());
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/util/Vec3Impl.java b/src/main/java/com/github/technus/tectech/util/Vec3Impl.java
deleted file mode 100644
index 9ba96d741a..0000000000
--- a/src/main/java/com/github/technus/tectech/util/Vec3Impl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.github.technus.tectech.util;
-
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.dispenser.IPosition;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public class Vec3Impl implements Comparable<Vec3Impl> {
-    public static final Vec3Impl NULL_VECTOR = new Vec3Impl(0, 0, 0);
-    private final int val0;
-    private final int val1;
-    private final int val2;
-
-    public Vec3Impl(int in0, int in1, int in2) {
-        this.val0 = in0;
-        this.val1 = in1;
-        this.val2 = in2;
-    }
-
-    public Vec3Impl(IGregTechTileEntity baseMetaTileEntity) {
-        this(baseMetaTileEntity.getXCoord(),baseMetaTileEntity.getYCoord(),baseMetaTileEntity.getZCoord());
-    }
-
-    public int compareTo(Vec3Impl o) {
-        return val1 == o.val1 ? val2 == o.val2 ? val0 - o.val0 : val2 - o.val2 : val1 - o.val1;
-    }
-
-    /**
-     * Gets the coordinate.
-     */
-    public int get(int index) {
-        switch (index){
-            case 0: return val0;
-            case 1: return val1;
-            case 2: return val2;
-            default: return 0;
-        }
-    }
-
-    /**
-     * Gets the X coordinate.
-     */
-    public int get0() {
-        return this.val0;
-    }
-
-    /**
-     * Gets the Y coordinate.
-     */
-    public int get1() {
-        return this.val1;
-    }
-
-    /**
-     * Gets the Z coordinate.
-     */
-    public int get2() {
-        return this.val2;
-    }
-
-    public Vec3Impl offset(ForgeDirection facing, int n) {
-        return n == 0 ? this : new Vec3Impl(val0 + facing.offsetX * n, val1 + facing.offsetY * n, val2 + facing.offsetZ * n);
-    }
-
-    public Vec3Impl add(IGregTechTileEntity tileEntity) {
-        return new Vec3Impl(val0 + tileEntity.getXCoord(), val1 + tileEntity.getYCoord(), val2 + tileEntity.getZCoord());
-    }
-
-    public Vec3Impl sub(IGregTechTileEntity tileEntity) {
-        return new Vec3Impl(val0 - tileEntity.getXCoord(), val1 - tileEntity.getYCoord(), val2 - tileEntity.getZCoord());
-    }
-
-    public Vec3Impl add(Vec3Impl pos) {
-        return new Vec3Impl(val0 + pos.val0, val1 + pos.val1, val2 + pos.val2);
-    }
-
-    public Vec3Impl sub(Vec3Impl pos) {
-        return new Vec3Impl(val0 - pos.val0, val1 - pos.val1, val2 - pos.val2);
-    }
-
-    public Vec3Impl add(int pos0,int pos1,int pos2) {
-        return new Vec3Impl(val0 + pos0, val1 + pos1, val2 + pos2);
-    }
-
-    public Vec3Impl sub(int pos0,int pos1,int pos2) {
-        return new Vec3Impl(val0 - pos0, val1 - pos1, val2 - pos2);
-    }
-
-    public Vec3Impl crossProduct(Vec3Impl vec) {
-        return new Vec3Impl(val1 * vec.val2 - val2 * vec.val1, val2 * vec.val0 - val0 * vec.val2,
-                val0 * vec.val1 - val1 * vec.val0);
-    }
-
-    public boolean withinDistance(Vec3Impl to, double distance) {
-        return this.distanceSq(to.val0, to.val1, to.val2, false) < distance * distance;
-    }
-
-    public boolean withinDistance(IPosition to, double distance) {
-        return this.distanceSq(to.getX(), to.getY(), to.getZ(), true) < distance * distance;
-    }
-
-    public double distanceSq(Vec3Impl to) {
-        return this.distanceSq(to.val0, to.val1, to.val2, true);
-    }
-
-    public double distanceSq(IPosition to, boolean useCenter) {
-        return this.distanceSq(to.getX(), to.getY(), to.getZ(), useCenter);
-    }
-
-    public double distanceSq(double x, double y, double z, boolean useCenter) {
-        double d0 = useCenter ? 0.5D : 0.0D;
-        double d1 = (double)val0 + d0 - x;
-        double d2 = (double)val1 + d0 - y;
-        double d3 = (double)val2 + d0 - z;
-        return d1 * d1 + d2 * d2 + d3 * d3;
-    }
-
-    public int manhattanDistance(Vec3Impl to) {
-        float f = (float)Math.abs(to.val0 - val0);
-        float f1 = (float)Math.abs(to.val1 - val1);
-        float f2 = (float)Math.abs(to.val2 - val2);
-        return (int)(f + f1 + f2);
-    }
-
-    @Override
-    public String toString() {
-        return "Vec3[" + val0 + ", " + val1 + ", " + val2 + "]";
-    }
-
-    public Vec3Impl abs() {
-        return new Vec3Impl(Math.abs(val0),Math.abs(val1),Math.abs(val2));
-    }
-
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        } else if (o instanceof Vec3Impl) {
-            Vec3Impl vec3i = (Vec3Impl)o;
-            return val0 == vec3i.val0 && val1 == vec3i.val1 && val2 == vec3i.val2;
-        }
-        return false;
-    }
-
-    public int hashCode() {
-        return (val1 + val2 * 31) * 31 + val0;
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 7924545051..79c46b07a2 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -314,9 +314,9 @@ gt.blockmachines.hatch.dynamomulti64.tier.11.name=UIV 64A Dynamo Hatch
 gt.blockmachines.hatch.dynamomulti04.tier.12.name=UMV 4A Dynamo Hatch
 gt.blockmachines.hatch.dynamomulti16.tier.12.name=UMV 16A Dynamo Hatch
 gt.blockmachines.hatch.dynamomulti64.tier.12.name=UMV 64A Dynamo Hatch
-gt.blockmachines.hatch.dynamomulti04.tier.13.name=IV 4A Dynamo Hatch
-gt.blockmachines.hatch.dynamomulti16.tier.13.name=IV 16A Dynamo Hatch
-gt.blockmachines.hatch.dynamomulti64.tier.13.name=IV 64A Dynamo Hatch
+gt.blockmachines.hatch.dynamomulti04.tier.13.name=UXV 4A Dynamo Hatch
+gt.blockmachines.hatch.dynamomulti16.tier.13.name=UXV 16A Dynamo Hatch
+gt.blockmachines.hatch.dynamomulti64.tier.13.name=UXV 64A Dynamo Hatch
 gt.blockmachines.hatch.dynamomulti.desc.0=Multiple Ampere Energy Extractor for Multiblocks
 gt.blockmachines.hatch.dynamomulti.desc.1=Amperes Out
 
@@ -652,7 +652,7 @@ gt.blockmachines.multimachine.em.scanner.hint.3=4 - Elemental Overflow Hatches o
 gt.blockmachines.multimachine.em.scanner.desc.0=What is existing here?
 gt.blockmachines.multimachine.em.scanner.desc.1=I HAVE NO IDEA (yet)!
 
-gt.blockmachines.multimachine.em.research.name=Research station
+gt.blockmachines.multimachine.em.research.name=Research Station
 gt.blockmachines.multimachine.em.research.hint.0=1 - Classic/Data Hatches or Computer casing
 gt.blockmachines.multimachine.em.research.hint.1=2 - Holder Hatch
 gt.blockmachines.multimachine.em.research.desc.0=Philosophers didn't even...
diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang
index 56cecd80c2..2d594ffb8e 100644
--- a/src/main/resources/assets/tectech/lang/zh_CN.lang
+++ b/src/main/resources/assets/tectech/lang/zh_CN.lang
@@ -50,8 +50,8 @@ item.em.EuMeterGT.desc.1=只需右键方块.
 
 item.em.frontRotate.name=正面旋转扳手
 item.em.frontRotate.desc.0=触发正面旋转界面
-item.em.frontRotate.desc.1=仅旋转前面板,
-item.em.frontRotate.desc.2=允许结构旋转.
+item.em.frontRotate.desc.1=可以旋转多方块控制器,
+item.em.frontRotate.desc.2=从而使整个结构可以旋转.
 
 item.em.parametrizerMemoryCard.name=数据化储存卡
 item.em.parametrizerMemoryCard.desc.0=存储参数
@@ -313,9 +313,9 @@ gt.blockmachines.hatch.dynamomulti64.tier.11.name=64安UIV动力仓
 gt.blockmachines.hatch.dynamomulti04.tier.12.name=4安UMV动力仓
 gt.blockmachines.hatch.dynamomulti16.tier.12.name=16安UMV动力仓
 gt.blockmachines.hatch.dynamomulti64.tier.12.name=64安UMV动力仓
-gt.blockmachines.hatch.dynamomulti04.tier.13.name=4安IV动力仓
-gt.blockmachines.hatch.dynamomulti16.tier.13.name=16安IV动力仓
-gt.blockmachines.hatch.dynamomulti64.tier.13.name=64安IV动力仓
+gt.blockmachines.hatch.dynamomulti04.tier.13.name=4安UXV动力仓
+gt.blockmachines.hatch.dynamomulti16.tier.13.name=16安UXV动力仓
+gt.blockmachines.hatch.dynamomulti64.tier.13.name=64安UXV动力仓
 gt.blockmachines.hatch.dynamomulti.desc.0=从多方块机器以高电流输出能源
 gt.blockmachines.hatch.dynamomulti.desc.1=输出电流
 
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
index f7fc68f278..21ecee23f8 100644
--- a/src/main/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,10 +1,10 @@
 [
 {
-  "modid": "tectech",
-  "name": "TecTech",
+  "modid": "${modId}",
+  "name": "${modName}",
   "description": "TecTech - Tec Technology Interdimensional! Replace UUMatter with something overly complicated and annoying! (GT5u Addon)",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "",
   "updateUrl": "",
   "authorList": ["_Technus_"],
-- 
cgit 


From 01ccba8c538a43cfd6a0e1d169c7659871a2f305 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Mon, 31 Jan 2022 21:29:47 +0100
Subject: Make font not use UTF-8 literal

---
 .../com/github/technus/tectech/font/TecTechFontRender.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
index fbbc12fe36..ffbef07158 100644
--- a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
+++ b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
@@ -14,14 +14,14 @@ import org.lwjgl.opengl.GL11;
 public class TecTechFontRender extends FontRenderer {
     public static final TecTechFontRender INSTANCE = new TecTechFontRender();
 
-    private static float DISTANCE_L  = .125F;
-    private static float DISTANCE_L2 = DISTANCE_L * 2F;
+    private static final float DISTANCE_L  = .125F;
+    private static final float DISTANCE_L2 = DISTANCE_L * 2F;
 
-    private static float DISTANCE_M  = 0.06F;
-    private static float DISTANCE_M2 = DISTANCE_M * 2F;
+    private static final float DISTANCE_M  = 0.06F;
+    private static final float DISTANCE_M2 = DISTANCE_M * 2F;
 
-    private static float DISTANCE_A  = 0.06F;
-    private static float DISTANCE_A2 = DISTANCE_A * 2F;
+    private static final float DISTANCE_A  = 0.06F;
+    private static final float DISTANCE_A2 = DISTANCE_A * 2F;
 
 
     private TecTechFontRender() {
@@ -119,7 +119,7 @@ public class TecTechFontRender extends FontRenderer {
 
                 ++i;
             } else {
-                j = "ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u0000".indexOf(c0);
+                j = "\u00C0\u00C1\u00C2\u00C8\u00CA\u00CB\u00CD\u00D3\u00D4\u00D5\u00DA\u00DF\u00E3\u00F5\u011F\u0130\u0131\u0152\u0153\u015E\u015F\u0174\u0175\u017E\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00C7\u00FC\u00E9\u00E2\u00E4\u00E0\u00E5\u00E7\u00EA\u00EB\u00E8\u00EF\u00EE\u00EC\u00C4\u00C5\u00C9\u00E6\u00C6\u00F4\u00F6\u00F2\u00FB\u00F9\u00FF\u00D6\u00DC\u00F8\u00A3\u00D8\u00D7\u0192\u00E1\u00ED\u00F3\u00FA\u00F1\u00D1\u00AA\u00BA\u00BF\u00AE\u00AC\u00BD\u00BC\u00A1\u00AB\u00BB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\u03B2\u0393\u03C0\u03A3\u03C3\u03BC\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u2205\u2208\u2229\u2261\u00B1\u2265\u2264\u2320\u2321\u00F7\u2248\u00B0\u2219\u00B7\u221A\u207F\u00B2\u25A0\u0000".indexOf(c0);
                 if (this.randomStyle && j != -1) {
                     do {
                         k = this.fontRandom.nextInt(this.charWidth.length);
-- 
cgit 


From 87ad4fe10fbf8b816102c3cf81caf23d1c88afe3 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Mon, 31 Jan 2022 23:00:13 +0100
Subject: Cleanup structures

---
 .../multi/GT_MetaTileEntity_EM_annihilation.java   |  54 ++++----
 .../multi/GT_MetaTileEntity_EM_bhg.java            | 147 ++++++++++-----------
 .../multi/GT_MetaTileEntity_EM_computer.java       |  34 ++---
 .../multi/GT_MetaTileEntity_EM_crafting.java       |  16 +--
 .../multi/GT_MetaTileEntity_EM_dataBank.java       |  16 +--
 .../multi/GT_MetaTileEntity_EM_decay.java          |   6 +-
 .../multi/GT_MetaTileEntity_EM_dequantizer.java    |  28 ++--
 .../multi/GT_MetaTileEntity_EM_infuser.java        |  18 +--
 .../multi/GT_MetaTileEntity_EM_junction.java       |  14 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |  20 +--
 .../multi/GT_MetaTileEntity_EM_research.java       |  58 ++++----
 .../multi/GT_MetaTileEntity_EM_scanner.java        |  44 +++---
 .../multi/GT_MetaTileEntity_EM_stabilizer.java     |  16 +--
 .../multi/GT_MetaTileEntity_EM_switch.java         |  20 +--
 .../multi/GT_MetaTileEntity_EM_transformer.java    |  38 +++---
 .../multi/GT_MetaTileEntity_EM_wormhole.java       |  24 ++--
 .../multi/GT_MetaTileEntity_TM_microwave.java      |  42 +++---
 .../multi/GT_MetaTileEntity_TM_teslaCoil.java      | 144 ++++++++++----------
 .../em_collider/GT_MetaTileEntity_EM_collider.java |  66 +++++----
 .../em_machine/GT_MetaTileEntity_EM_machine.java   |  30 ++---
 20 files changed, 421 insertions(+), 414 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
index ba3bfe728d..8a51494b94 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_annihilation.java
@@ -29,9 +29,9 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region variables
-    private static Textures.BlockIcons.CustomIcon ScreenOFF;
-    private static Textures.BlockIcons.CustomIcon ScreenON;
-    private static final String[] description = new String[]{
+    private static       Textures.BlockIcons.CustomIcon ScreenOFF;
+    private static       Textures.BlockIcons.CustomIcon ScreenON;
+    private static final String[]                       description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.annihilation.hint.0"),//1 - Classic Hatches or High Power Casing
             translateToLocal("gt.blockmachines.multimachine.em.annihilation.hint.1"),//2 - Elemental Hatches or Molecular Casing
@@ -39,30 +39,30 @@ public class GT_MetaTileEntity_EM_annihilation extends GT_MetaTileEntity_Multibl
     //endregion
 
     //region structure
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_annihilation> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_annihilation>builder()
-                    .addShape("main", transpose(new String[][]{
-                            {"           ","   AB BA   ","   AB BA   ","    BBB    "," A   A   A ","AA   F   AA"," A   A   A ","    BBB    ","   AB BA   ","   AB BA   ","           "},
-                            {"           ","   AB BA   "," EECEEECEE "," EGGEEEGGE ","ACGGGEGGGCA","AEGGGDGGGEA","ACGGGEGGGCA"," EGGEEEGGE "," EECEEECEE ","   AB BA   ","           "},
-                            {"           ","    B B    "," EGGEGEGGE "," G       G "," G       G "," G       G "," G       G "," G       G "," EGGEGEGGE ","    B B    ","           "},
-                            {"    AAA    ","AA  BAB  AA","ACGGEGEGGCA"," G       G "," G       G "," G       G "," G       G "," G       G ","ACGGEGEGGCA","AA  BAB  AA","    AAA    "},
-                            {"   AHHHA   ","BBBBBBBBBBB","BEEEDEDEEEB","BE       EB"," G       G "," G       G "," G       G ","BE       EB","BEEEDEDEEEB","BBBBBBBBBBB","   AHHHA   "},
-                            {"   AH~HA   ","   ABBBA   "," EGGEEEGGE ","BE       EB","AE       EA","FD       DF","AE       EA","BE       EB"," EGGEEEGGE ","   ABBBA   ","   AHHHA   "},
-                            {"   AHHHA   ","BBBBBBBBBBB","BEEEDEDEEEB","BE       EB"," G       G "," G       G "," G       G ","BE       EB","BEEEDEDEEEB","BBBBBBBBBBB","   AHHHA   "},
-                            {"    AAA    ","AA  BAB  AA","ACGGEGEGGCA"," G       G "," G       G "," G       G "," G       G "," G       G ","ACGGEGEGGCA","AA  BAB  AA","    AAA    "},
-                            {"           ","    B B    "," EGGEGEGGE "," G       G "," G       G "," G       G "," G       G "," G       G "," EGGEGEGGE ","    B B    ","           "},
-                            {"           ","   AB BA   "," EECEEECEE "," EGGEEEGGE ","ACGGGEGGGCA","AEGGGDGGGEA","ACGGGEGGGCA"," EGGEEEGGE "," EECEEECEE ","   AB BA   ","           "},
-                            {"           ","   AB BA   ","   AB BA   ","    BBB    "," A   A   A ","AA   F   AA"," A   A   A ","    BBB    ","   AB BA   ","   AB BA   ","           "}
-                    }))
-                    .addElement('A', ofBlock(sBlockCasingsTT, 4))
-                    .addElement('B', ofBlock(sBlockCasingsTT, 5))
-                    .addElement('C', ofBlock(sBlockCasingsTT, 6))
-                    .addElement('D', ofBlock(sBlockCasingsTT, 10))
-                    .addElement('E', ofBlock(sBlockCasingsTT, 12))
-                    .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_annihilation::addElementalToMachineList, textureOffset + 4,2, sBlockCasingsTT, 4))
-                    .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-                    .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_annihilation::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-                    .build();
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_annihilation> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_annihilation>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"           ", "   AB BA   ", "   AB BA   ", "    BBB    ", " A   A   A ", "AA   F   AA", " A   A   A ", "    BBB    ", "   AB BA   ", "   AB BA   ", "           "},
+                    {"           ", "   AB BA   ", " EECEEECEE ", " EGGEEEGGE ", "ACGGGEGGGCA", "AEGGGDGGGEA", "ACGGGEGGGCA", " EGGEEEGGE ", " EECEEECEE ", "   AB BA   ", "           "},
+                    {"           ", "    B B    ", " EGGEGEGGE ", " G       G ", " G       G ", " G       G ", " G       G ", " G       G ", " EGGEGEGGE ", "    B B    ", "           "},
+                    {"    AAA    ", "AA  BAB  AA", "ACGGEGEGGCA", " G       G ", " G       G ", " G       G ", " G       G ", " G       G ", "ACGGEGEGGCA", "AA  BAB  AA", "    AAA    "},
+                    {"   AHHHA   ", "BBBBBBBBBBB", "BEEEDEDEEEB", "BE       EB", " G       G ", " G       G ", " G       G ", "BE       EB", "BEEEDEDEEEB", "BBBBBBBBBBB", "   AHHHA   "},
+                    {"   AH~HA   ", "   ABBBA   ", " EGGEEEGGE ", "BE       EB", "AE       EA", "FD       DF", "AE       EA", "BE       EB", " EGGEEEGGE ", "   ABBBA   ", "   AHHHA   "},
+                    {"   AHHHA   ", "BBBBBBBBBBB", "BEEEDEDEEEB", "BE       EB", " G       G ", " G       G ", " G       G ", "BE       EB", "BEEEDEDEEEB", "BBBBBBBBBBB", "   AHHHA   "},
+                    {"    AAA    ", "AA  BAB  AA", "ACGGEGEGGCA", " G       G ", " G       G ", " G       G ", " G       G ", " G       G ", "ACGGEGEGGCA", "AA  BAB  AA", "    AAA    "},
+                    {"           ", "    B B    ", " EGGEGEGGE ", " G       G ", " G       G ", " G       G ", " G       G ", " G       G ", " EGGEGEGGE ", "    B B    ", "           "},
+                    {"           ", "   AB BA   ", " EECEEECEE ", " EGGEEEGGE ", "ACGGGEGGGCA", "AEGGGDGGGEA", "ACGGGEGGGCA", " EGGEEEGGE ", " EECEEECEE ", "   AB BA   ", "           "},
+                    {"           ", "   AB BA   ", "   AB BA   ", "    BBB    ", " A   A   A ", "AA   F   AA", " A   A   A ", "    BBB    ", "   AB BA   ", "   AB BA   ", "           "}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 4))
+            .addElement('B', ofBlock(sBlockCasingsTT, 5))
+            .addElement('C', ofBlock(sBlockCasingsTT, 6))
+            .addElement('D', ofBlock(sBlockCasingsTT, 10))
+            .addElement('E', ofBlock(sBlockCasingsTT, 12))
+            .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_annihilation::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_annihilation::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_annihilation(int aID, String aName, String aNameRegional) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
index 5f177ef859..3d6bb58cb0 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java
@@ -35,10 +35,10 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
     //todo CHECK VALUES
-    private static final double NEUTRONIUM_BLOCK_MASS = 4.1E17;
-    private static final double NEUTRONIUM_BLOCK_ATOM_COUNT = 2.4478671E44;
+    private static final double NEUTRONIUM_BLOCK_MASS          = 4.1E17;
+    private static final double NEUTRONIUM_BLOCK_ATOM_COUNT    = 2.4478671E44;
     private static final double NEUTRONIUM_BLOCK_TO_EU_INSTANT = URANIUM_MASS_TO_EU_INSTANT * NEUTRONIUM_BLOCK_MASS / (URANIUM_INGOT_MASS_DIFF * 1.78266191e-36);//~ 5.314e40
-    private static final double NEUTRON_TO_EU_INSTANT = NEUTRONIUM_BLOCK_TO_EU_INSTANT / NEUTRONIUM_BLOCK_ATOM_COUNT;//~ 0.00021708694
+    private static final double NEUTRON_TO_EU_INSTANT          = NEUTRONIUM_BLOCK_TO_EU_INSTANT / NEUTRONIUM_BLOCK_ATOM_COUNT;//~ 0.00021708694
 
     public boolean glassDome = false;
     //endregion
@@ -48,86 +48,86 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E
     //per dim disable thingies
 
     //region structure actual
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_bhg> STRUCTURE_DEFINITION=
-            IStructureDefinition.<GT_MetaTileEntity_EM_bhg>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_bhg> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_bhg>builder()
             .addShape("main_t1", transpose(new String[][]{
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","               C C               ","              DDDDD              ","             DDCDCDD             ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","             DDCDCDD             ","              DDDDD              ","               C C               ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","                D                ","                D                ","             DDDDDDD             ","            DD     DD            ","            D  EEE  D            ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","            D  EEE  D            ","            DD     DD            ","             DDDDDDD             ","                D                ","                D                ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                B                ","                                 ","                                 ","                                 ","                                 ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","                                 ","                                 ","                                 ","                                 ","                B                ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","       E                 E       ","       E                 E       ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","       E                 E       ","       E                 E       ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","     E                     E     ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","     E                     E     ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 "},
-                    {"                                 ","                                 ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  C                           C  ","   DB                       BD   ","  C                           C  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","                                 ","                                 "},
-                    {"                                 ","               C C               ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," CC                           CC ","   DB                       BD   "," CC                           CC ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","               C C               ","                                 "},
-                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
-                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
-                    {"             CCCCCCC             ","               C C               ","             DDDDDDD             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  ","CCD                           DCC","  D                           D  ","CCD                           DCC","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             DDDDDDD             ","               C C               ","               C C               "},
-                    {"            CCHHHHHCC            ","              DDDDD              ","            DD     DD            ","                                 ","                                 ","       E                 E       ","                                 ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D ","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","                                 ","       E                 E       ","                                 ","                                 ","            DD     DD            ","              DDDDD              ","               C C               "},
-                    {"            CHHHHHHHC            ","             DDCDCDD             ","            D  EEE  D            ","                                 ","      C                   C      ","       E                 E       ","    C                       C    ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","    C                       C    ","       E                 E       ","      C                   C      ","                                 ","            D  EEE  D            ","             DDCDCDD             ","               C C               "},
-                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
-                    {"            CHHF~FHHC            ","             DDDDDDD             ","          DDD EAAAE DDD          ","        DD             DD        ","      CDBB             BBDC      ","      DB                 BD      ","    CDB                   BDC    ","    DB                     BD    ","   DB                       BD   ","   DB                       BD   ","  D                           D  ","  D                           D  ","  D                           D  "," D                             D "," DE                           ED ","CDA                           ADC"," DA                           AD ","CDA                           ADC"," DE                           ED "," D                             D ","  D                           D  ","  D                           D  ","  D                           D  ","   DB                       BD   ","   DB                       BD   ","    DB                     BD    ","    CDB                   BDC    ","      DB                 BD      ","      CDBB             BBDC      ","        DD             DD        ","          DDD EAAAE DDD          ","             DDDDDDD             ","               C C               "},
-                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
-                    {"            CHHHHHHHC            ","             DDCDCDD             ","            D  EEE  D            ","                                 ","      C                   C      ","       E                 E       ","    C                       C    ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","    C                       C    ","       E                 E       ","      C                   C      ","                                 ","            D  EEE  D            ","             DDCDCDD             ","               C C               "},
-                    {"            CCHHHHHCC            ","              DDDDD              ","            DD     DD            ","                                 ","                                 ","       E                 E       ","                                 ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D ","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","                                 ","       E                 E       ","                                 ","                                 ","            DD     DD            ","              DDDDD              ","               C C               "},
-                    {"             CCCCCCC             ","               C C               ","             DDDDDDD             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  D                           D  ","  D                           D  ","CCD                           DCC","  D                           D  ","CCD                           DCC","  D                           D  ","  D                           D  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             DDDDDDD             ","               C C               ","               C C               "},
-                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
-                    {"                                 ","               C C               ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," C                             C ","  D                           D  "," C                             C ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                D                ","               C C               ","                                 "},
-                    {"                                 ","               C C               ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "," CC                           CC ","   DB                       BD   "," CC                           CC ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","               C C               ","                                 "},
-                    {"                                 ","                                 ","               C C               ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","  C                           C  ","   DB                       BD   ","  C                           C  ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","               C C               ","                                 ","                                 "},
-                    {"                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","     E                     E     ","     E                     E     ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","     E                     E     ","     E                     E     ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","             EEEBEEE             ","                                 ","                                 ","                                 ","                                 ","                                 ","       E                 E       ","       E                 E       ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","       E                 E       ","       E                 E       ","                                 ","                                 ","                                 ","                                 ","                                 ","             EEEBEEE             ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","              CCCCC              ","                D                ","                B                ","                B                ","                                 ","                                 ","                                 ","                                 ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","                                 ","                                 ","                                 ","                                 ","                B                ","                B                ","                D                ","              CCCCC              ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","                D                ","                D                ","                                 ","                                 ","                                 ","                                 ","                                 ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","                                 ","                                 ","                                 ","                D                ","                D                ","                D                ","                D                ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","                D                ","                D                ","             DDDDDDD             ","            DD     DD            ","            D  EEE  D            ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","            D  EEE  D            ","            DD     DD            ","             DDDDDDD             ","                D                ","                D                ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","               C C               ","              DDDDD              ","             DDCDCDD             ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","             DDCDCDD             ","              DDDDD              ","               C C               ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "}
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "               C C               ", "              DDDDD              ", "             DDCDCDD             ", "         CCCCDCCDCCDCCCC         ", "             DDDDDDD             ", "         CCCCDCCDCCDCCCC         ", "             DDCDCDD             ", "              DDDDD              ", "               C C               ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "                D                ", "                D                ", "             DDDDDDD             ", "            DD     DD            ", "            D  EEE  D            ", "       CCC  D EAAAE D  CCC       ", "          DDD EAAAE DDD          ", "       CCC  D EAAAE D  CCC       ", "            D  EEE  D            ", "            DD     DD            ", "             DDDDDDD             ", "                D                ", "                D                ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "                D                ", "                D                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "      CC                 CC      ", "        DD             DD        ", "      CC                 CC      ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                D                ", "                D                ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "              CCCCC              ", "                D                ", "                B                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "      C                   C      ", "     CC                   CC     ", "      CDBB             BBDC      ", "     CC                   CC     ", "      C                   C      ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                B                ", "                D                ", "              CCCCC              ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "                D                ", "             EEEBEEE             ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "       E                 E       ", "       E                 E       ", "    CC E                 E CC    ", "      DB                 BD      ", "    CC E                 E CC    ", "       E                 E       ", "       E                 E       ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "             EEEBEEE             ", "                D                ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "               C C               ", "              CCCCC              ", "                D                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "    C                       C    ", "   CC                       CC   ", "    CDB                   BDC    ", "   CC                       CC   ", "    C                       C    ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                D                ", "              CCCCC              ", "               C C               ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "               C C               ", "               C C               ", "                D                ", "             EEEBEEE             ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "     E                     E     ", "     E                     E     ", "  CC E                     E CC  ", "    DB                     BD    ", "  CC E                     E CC  ", "     E                     E     ", "     E                     E     ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "             EEEBEEE             ", "                D                ", "               C C               ", "               C C               ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "               C C               ", "                D                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "  C                           C  ", "   DB                       BD   ", "  C                           C  ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                D                ", "               C C               ", "                                 ", "                                 "},
+                    {"                                 ", "               C C               ", "               C C               ", "                D                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", " CC                           CC ", "   DB                       BD   ", " CC                           CC ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                D                ", "               C C               ", "               C C               ", "                                 "},
+                    {"                                 ", "               C C               ", "                D                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", " C                             C ", "  D                           D  ", " C                             C ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                D                ", "               C C               ", "                                 "},
+                    {"                                 ", "               C C               ", "                D                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", " C                             C ", "  D                           D  ", " C                             C ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                D                ", "               C C               ", "                                 "},
+                    {"             CCCCCCC             ", "               C C               ", "             DDDDDDD             ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "  D                           D  ", "  D                           D  ", "CCD                           DCC", "  D                           D  ", "CCD                           DCC", "  D                           D  ", "  D                           D  ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "             DDDDDDD             ", "               C C               ", "               C C               "},
+                    {"            CCHHHHHCC            ", "              DDDDD              ", "            DD     DD            ", "                                 ", "                                 ", "       E                 E       ", "                                 ", "     E                     E     ", "                                 ", "                                 ", "                                 ", "                                 ", "  D                           D  ", "  D                           D  ", " D                             D ", "CD                             DC", " D                             D ", "CD                             DC", " D                             D ", "  D                           D  ", "  D                           D  ", "                                 ", "                                 ", "                                 ", "                                 ", "     E                     E     ", "                                 ", "       E                 E       ", "                                 ", "                                 ", "            DD     DD            ", "              DDDDD              ", "               C C               "},
+                    {"            CHHHHHHHC            ", "             DDCDCDD             ", "            D  EEE  D            ", "                                 ", "      C                   C      ", "       E                 E       ", "    C                       C    ", "     E                     E     ", "                                 ", "                                 ", "                                 ", "                                 ", "  D                           D  ", " D                             D ", " D                             D ", "CCE                           ECC", " DE                           ED ", "CCE                           ECC", " D                             D ", " D                             D ", "  D                           D  ", "                                 ", "                                 ", "                                 ", "                                 ", "     E                     E     ", "    C                       C    ", "       E                 E       ", "      C                   C      ", "                                 ", "            D  EEE  D            ", "             DDCDCDD             ", "               C C               "},
+                    {"            CHHFFFHHC            ", "         CCCCDCCDCCDCCCC         ", "       CCC  D EAAAE D  CCC       ", "      CC                 CC      ", "     CC                   CC     ", "    CC E                 E CC    ", "   CC                       CC   ", "  CC E                     E CC  ", "  C                           C  ", " CC                           CC ", " C                             C ", " C                             C ", "CCD                           DCC", "CD                             DC", "CCE                           ECC", "CCA                           ACC", "CDA                           ADC", "CCA                           ACC", "CCE                           ECC", "CD                             DC", "CCD                           DCC", " C                             C ", " C                             C ", " CC                           CC ", "  C                           C  ", "  CC E                     E CC  ", "   CC                       CC   ", "    CC E                 E CC    ", "     CC                   CC     ", "      CC                 CC      ", "       CCC  D EAAAE D  CCC       ", "         CCCCDCCDCCDCCCC         ", "            CCCCCCCCC            "},
+                    {"            CHHF~FHHC            ", "             DDDDDDD             ", "          DDD EAAAE DDD          ", "        DD             DD        ", "      CDBB             BBDC      ", "      DB                 BD      ", "    CDB                   BDC    ", "    DB                     BD    ", "   DB                       BD   ", "   DB                       BD   ", "  D                           D  ", "  D                           D  ", "  D                           D  ", " D                             D ", " DE                           ED ", "CDA                           ADC", " DA                           AD ", "CDA                           ADC", " DE                           ED ", " D                             D ", "  D                           D  ", "  D                           D  ", "  D                           D  ", "   DB                       BD   ", "   DB                       BD   ", "    DB                     BD    ", "    CDB                   BDC    ", "      DB                 BD      ", "      CDBB             BBDC      ", "        DD             DD        ", "          DDD EAAAE DDD          ", "             DDDDDDD             ", "               C C               "},
+                    {"            CHHFFFHHC            ", "         CCCCDCCDCCDCCCC         ", "       CCC  D EAAAE D  CCC       ", "      CC                 CC      ", "     CC                   CC     ", "    CC E                 E CC    ", "   CC                       CC   ", "  CC E                     E CC  ", "  C                           C  ", " CC                           CC ", " C                             C ", " C                             C ", "CCD                           DCC", "CD                             DC", "CCE                           ECC", "CCA                           ACC", "CDA                           ADC", "CCA                           ACC", "CCE                           ECC", "CD                             DC", "CCD                           DCC", " C                             C ", " C                             C ", " CC                           CC ", "  C                           C  ", "  CC E                     E CC  ", "   CC                       CC   ", "    CC E                 E CC    ", "     CC                   CC     ", "      CC                 CC      ", "       CCC  D EAAAE D  CCC       ", "         CCCCDCCDCCDCCCC         ", "            CCCCCCCCC            "},
+                    {"            CHHHHHHHC            ", "             DDCDCDD             ", "            D  EEE  D            ", "                                 ", "      C                   C      ", "       E                 E       ", "    C                       C    ", "     E                     E     ", "                                 ", "                                 ", "                                 ", "                                 ", "  D                           D  ", " D                             D ", " D                             D ", "CCE                           ECC", " DE                           ED ", "CCE                           ECC", " D                             D ", " D                             D ", "  D                           D  ", "                                 ", "                                 ", "                                 ", "                                 ", "     E                     E     ", "    C                       C    ", "       E                 E       ", "      C                   C      ", "                                 ", "            D  EEE  D            ", "             DDCDCDD             ", "               C C               "},
+                    {"            CCHHHHHCC            ", "              DDDDD              ", "            DD     DD            ", "                                 ", "                                 ", "       E                 E       ", "                                 ", "     E                     E     ", "                                 ", "                                 ", "                                 ", "                                 ", "  D                           D  ", "  D                           D  ", " D                             D ", "CD                             DC", " D                             D ", "CD                             DC", " D                             D ", "  D                           D  ", "  D                           D  ", "                                 ", "                                 ", "                                 ", "                                 ", "     E                     E     ", "                                 ", "       E                 E       ", "                                 ", "                                 ", "            DD     DD            ", "              DDDDD              ", "               C C               "},
+                    {"             CCCCCCC             ", "               C C               ", "             DDDDDDD             ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "  D                           D  ", "  D                           D  ", "CCD                           DCC", "  D                           D  ", "CCD                           DCC", "  D                           D  ", "  D                           D  ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "             DDDDDDD             ", "               C C               ", "               C C               "},
+                    {"                                 ", "               C C               ", "                D                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", " C                             C ", "  D                           D  ", " C                             C ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                D                ", "               C C               ", "                                 "},
+                    {"                                 ", "               C C               ", "                D                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", " C                             C ", "  D                           D  ", " C                             C ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                D                ", "               C C               ", "                                 "},
+                    {"                                 ", "               C C               ", "               C C               ", "                D                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", " CC                           CC ", "   DB                       BD   ", " CC                           CC ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                D                ", "               C C               ", "               C C               ", "                                 "},
+                    {"                                 ", "                                 ", "               C C               ", "                D                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "  C                           C  ", "   DB                       BD   ", "  C                           C  ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                D                ", "               C C               ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "               C C               ", "               C C               ", "                D                ", "             EEEBEEE             ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "     E                     E     ", "     E                     E     ", "  CC E                     E CC  ", "    DB                     BD    ", "  CC E                     E CC  ", "     E                     E     ", "     E                     E     ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "             EEEBEEE             ", "                D                ", "               C C               ", "               C C               ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "               C C               ", "              CCCCC              ", "                D                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "    C                       C    ", "   CC                       CC   ", "    CDB                   BDC    ", "   CC                       CC   ", "    C                       C    ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                D                ", "              CCCCC              ", "               C C               ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "                D                ", "             EEEBEEE             ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "       E                 E       ", "       E                 E       ", "    CC E                 E CC    ", "      DB                 BD      ", "    CC E                 E CC    ", "       E                 E       ", "       E                 E       ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "             EEEBEEE             ", "                D                ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "              CCCCC              ", "                D                ", "                B                ", "                B                ", "                                 ", "                                 ", "                                 ", "                                 ", "      C                   C      ", "     CC                   CC     ", "      CDBB             BBDC      ", "     CC                   CC     ", "      C                   C      ", "                                 ", "                                 ", "                                 ", "                                 ", "                B                ", "                B                ", "                D                ", "              CCCCC              ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "                D                ", "                D                ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "      CC                 CC      ", "        DD             DD        ", "      CC                 CC      ", "                                 ", "                                 ", "                                 ", "                D                ", "                D                ", "                D                ", "                D                ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "                D                ", "                D                ", "             DDDDDDD             ", "            DD     DD            ", "            D  EEE  D            ", "       CCC  D EAAAE D  CCC       ", "          DDD EAAAE DDD          ", "       CCC  D EAAAE D  CCC       ", "            D  EEE  D            ", "            DD     DD            ", "             DDDDDDD             ", "                D                ", "                D                ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "               C C               ", "              DDDDD              ", "             DDCDCDD             ", "         CCCCDCCDCCDCCCC         ", "             DDDDDDD             ", "         CCCCDCCDCCDCCCC         ", "             DDCDCDD             ", "              DDDDD              ", "               C C               ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "}
             }))
             .addShape("main_t2", transpose(new String[][]{
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","            GGGC CGGG            ","           GGGGC CGGGG           ","          GGGGDDDDDGGGG          ","          GGGDDCDCDDGGG          ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","          GGGDDCDCDDGGG          ","          GGGGDDDDDGGGG          ","           GGGGC CGGGG           ","            GGGC CGGG            ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","           GGGGC CGGGG           ","          GGG   D   GGG          ","         GGG    D    GGG         ","         GG  DDDDDDD  GG         ","        GG  DD     DD  GG        ","        GG  D  EEE  D  GG        ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","        GG  D  EEE  D  GG        ","        GG  DD     DD  GG        ","         GG  DDDDDDD  GG         ","         GGG    D    GGG         ","          GGG   D   GGG          ","           GGGGC CGGGG           ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","            GGGC CGGG            ","          GGG   D   GGG          ","         GG     D     GG         ","        GG             GG        ","        G               G        ","       GG               GG       ","       G                 G       ","       G                 G       ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","       G                 G       ","       G                 G       ","       GG               GG       ","        G               G        ","        GG             GG        ","         GG     D     GG         ","          GGG   D   GGG          ","            GGGC CGGG            ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","         GGG    D    GGG         ","        GG      B      GG        ","       GG       B       GG       ","       G                 G       ","      GG                 GG      ","      G                   G      ","      G                   G      ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","      G                   G      ","      G                   G      ","      GG                 GG      ","       G                 G       ","       GG       B       GG       ","        GG      B      GG        ","         GGG    D    GGG         ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","          GGGGGC CGGGGG          ","        GGG     D     GGG        ","       GG    EEEBEEE    GG       ","      GG                 GG      ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","     G E                 E G     ","     G E                 E G     ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","     G E                 E G     ","     G E                 E G     ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","      GG                 GG      ","       GG    EEEBEEE    GG       ","        GGG     D     GGG        ","          GGGGGC CGGGGG          ","               C C               ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","        GGG     D     GGG        ","       GG       B       GG       ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","       GG       B       GG       ","        GGG     D     GGG        ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","               C C               ","            GGGC CGGG            ","         GGG    D    GGG         ","       GG    EEEBEEE    GG       ","      G                   G      ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","   G                         G   ","   G E                     E G   ","   G E                     E G   ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","   G E                     E G   ","   G E                     E G   ","   G                         G   ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","      G                   G      ","       GG    EEEBEEE    GG       ","         GGG    D    GGG         ","            GGGC CGGG            ","               C C               ","                                 ","                                 "},
-                    {"                                 ","                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG      B      GG        ","      GG                 GG      ","     GG                   GG     ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  C                           C  ","   DB                       BD   ","  C                           C  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","     GG                   GG     ","      GG                 GG      ","        GG      B      GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 ","                                 "},
-                    {"                                 ","               C C               ","           GGGGC CGGGG           ","         GG     D     GG         ","       GG       B       GG       ","      G                   G      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  "," CC                           CC ","   DB                       BD   "," CC                           CC ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      G                   G      ","       GG       B       GG       ","         GG     D     GG         ","           GGGGC CGGGG           ","               C C               ","                                 "},
-                    {"                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG             GG        ","       G                 G       ","     GG                   GG     ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","     GG                   GG     ","       G                 G       ","        GG             GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 "},
-                    {"                                 ","            GGGC CGGG            ","         GGG    D    GGG         ","        G               G        ","      GG                 GG      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      GG                 GG      ","        G               G        ","         GGG    D    GGG         ","            GGGC CGGG            ","                                 "},
-                    {"             CCCCCCC             ","           GGGGC CGGGG           ","         GG  DDDDDDD  GG         ","       GG               GG       ","      G                   G      ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG ","CCD                           DCC","  D                           D  ","CCD                           DCC"," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","      G                   G      ","       GG               GG       ","         GG  DDDDDDD  GG         ","           GGGGC CGGGG           ","               C C               "},
-                    {"            CCHHHHHCC            ","          GGGGDDDDDGGGG          ","        GG  DD     DD  GG        ","       G                 G       ","      G                   G      ","     G E                 E G     ","    G                       G    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D "," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    G                       G    ","     G E                 E G     ","      G                   G      ","       G                 G       ","        GG  DD     DD  GG        ","          GGGGDDDDDGGGG          ","               C C               "},
-                    {"            CHHHHHHHC            ","          GGGDDCDCDDGGG          ","        GG  D  EEE  D  GG        ","       G                 G       ","      C                   C      ","     G E                 E G     ","    C                       C    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    C                       C    ","     G E                 E G     ","      C                   C      ","       G                 G       ","        GG  D  EEE  D  GG        ","          GGGDDCDCDDGGG          ","               C C               "},
-                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
-                    {"            CHHF~FHHC            ","             DDDDDDD             ","          DDD EAAAE DDD          ","        DD             DD        ","      CDBB             BBDC      ","      DB                 BD      ","    CDB                   BDC    ","    DB                     BD    ","   DB                       BD   ","   DB                       BD   ","  D                           D  ","  D                           D  ","  D                           D  "," D                             D "," DE                           ED ","CDA                           ADC"," DA                           AD ","CDA                           ADC"," DE                           ED "," D                             D ","  D                           D  ","  D                           D  ","  D                           D  ","   DB                       BD   ","   DB                       BD   ","    DB                     BD    ","    CDB                   BDC    ","      DB                 BD      ","      CDBB             BBDC      ","        DD             DD        ","          DDD EAAAE DDD          ","             DDDDDDD             ","               C C               "},
-                    {"            CHHFFFHHC            ","         CCCCDCCDCCDCCCC         ","       CCC  D EAAAE D  CCC       ","      CC                 CC      ","     CC                   CC     ","    CC E                 E CC    ","   CC                       CC   ","  CC E                     E CC  ","  C                           C  "," CC                           CC "," C                             C "," C                             C ","CCD                           DCC","CD                             DC","CCE                           ECC","CCA                           ACC","CDA                           ADC","CCA                           ACC","CCE                           ECC","CD                             DC","CCD                           DCC"," C                             C "," C                             C "," CC                           CC ","  C                           C  ","  CC E                     E CC  ","   CC                       CC   ","    CC E                 E CC    ","     CC                   CC     ","      CC                 CC      ","       CCC  D EAAAE D  CCC       ","         CCCCDCCDCCDCCCC         ","            CCCCCCCCC            "},
-                    {"            CHHHHHHHC            ","          GGGDDCDCDDGGG          ","        GG  D  EEE  D  GG        ","       G                 G       ","      C                   C      ","     G E                 E G     ","    C                       C    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," D                             D "," D                             D ","CCE                           ECC"," DE                           ED ","CCE                           ECC"," D                             D "," D                             D "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    C                       C    ","     G E                 E G     ","      C                   C      ","       G                 G       ","        GG  D  EEE  D  GG        ","          GGGDDCDCDDGGG          ","               C C               "},
-                    {"            CCHHHHHCC            ","          GGGGDDDDDGGGG          ","        GG  DD     DD  GG        ","       G                 G       ","      G                   G      ","     G E                 E G     ","    G                       G    ","   G E                     E G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG "," D                             D ","CD                             DC"," D                             D ","CD                             DC"," D                             D "," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G E                     E G   ","    G                       G    ","     G E                 E G     ","      G                   G      ","       G                 G       ","        GG  DD     DD  GG        ","          GGGGDDDDDGGGG          ","               C C               "},
-                    {"             CCCCCCC             ","           GGGGC CGGGG           ","         GG  DDDDDDD  GG         ","       GG               GG       ","      G                   G      ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," GD                           DG "," GD                           DG ","CCD                           DCC","  D                           D  ","CCD                           DCC"," GD                           DG "," GD                           DG "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","      G                   G      ","       GG               GG       ","         GG  DDDDDDD  GG         ","           GGGGC CGGGG           ","               C C               "},
-                    {"                                 ","            GGGC CGGG            ","         GGG    D    GGG         ","        G               G        ","      GG                 GG      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      GG                 GG      ","        G               G        ","         GGG    D    GGG         ","            GGGC CGGG            ","                                 "},
-                    {"                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG             GG        ","       G                 G       ","     GG                   GG     ","     G                     G     ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  "," G                             G "," G                             G "," C                             C ","  D                           D  "," C                             C "," G                             G "," G                             G ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","     G                     G     ","     GG                   GG     ","       G                 G       ","        GG             GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 "},
-                    {"                                 ","               C C               ","           GGGGC CGGGG           ","         GG     D     GG         ","       GG       B       GG       ","      G                   G      ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  "," CC                           CC ","   DB                       BD   "," CC                           CC ","  G                           G  ","  G                           G  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","      G                   G      ","       GG       B       GG       ","         GG     D     GG         ","           GGGGC CGGGG           ","               C C               ","                                 "},
-                    {"                                 ","                                 ","             GGC CGG             ","          GGG   D   GGG          ","        GG      B      GG        ","      GG                 GG      ","     GG                   GG     ","     G                     G     ","    G                       G    ","    G                       G    ","   G                         G   ","   G                         G   ","   G                         G   ","  G                           G  ","  G                           G  ","  C                           C  ","   DB                       BD   ","  C                           C  ","  G                           G  ","  G                           G  ","   G                         G   ","   G                         G   ","   G                         G   ","    G                       G    ","    G                       G    ","     G                     G     ","     GG                   GG     ","      GG                 GG      ","        GG      B      GG        ","          GGG   D   GGG          ","             GGC CGG             ","                                 ","                                 "},
-                    {"                                 ","                                 ","               C C               ","            GGGC CGGG            ","         GGG    D    GGG         ","       GG    EEEBEEE    GG       ","      G                   G      ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","   G                         G   ","   G E                     E G   ","   G E                     E G   ","  CC E                     E CC  ","    DB                     BD    ","  CC E                     E CC  ","   G E                     E G   ","   G E                     E G   ","   G                         G   ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","      G                   G      ","       GG    EEEBEEE    GG       ","         GGG    D    GGG         ","            GGGC CGGG            ","               C C               ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","        GGG     D     GGG        ","       GG       B       GG       ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","    G                       G    ","    G                       G    ","    G                       G    ","    C                       C    ","   CC                       CC   ","    CDB                   BDC    ","   CC                       CC   ","    C                       C    ","    G                       G    ","    G                       G    ","    G                       G    ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","       GG       B       GG       ","        GGG     D     GGG        ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","               C C               ","          GGGGGC CGGGGG          ","        GGG     D     GGG        ","       GG    EEEBEEE    GG       ","      GG                 GG      ","      G                   G      ","     GG                   GG     ","     G                     G     ","     G                     G     ","     G E                 E G     ","     G E                 E G     ","    CC E                 E CC    ","      DB                 BD      ","    CC E                 E CC    ","     G E                 E G     ","     G E                 E G     ","     G                     G     ","     G                     G     ","     GG                   GG     ","      G                   G      ","      GG                 GG      ","       GG    EEEBEEE    GG       ","        GGG     D     GGG        ","          GGGGGC CGGGGG          ","               C C               ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","           GGGCCCCCGGG           ","         GGG    D    GGG         ","        GG      B      GG        ","       GG       B       GG       ","       G                 G       ","      GG                 GG      ","      G                   G      ","      G                   G      ","      C                   C      ","     CC                   CC     ","      CDBB             BBDC      ","     CC                   CC     ","      C                   C      ","      G                   G      ","      G                   G      ","      GG                 GG      ","       G                 G       ","       GG       B       GG       ","        GG      B      GG        ","         GGG    D    GGG         ","           GGGCCCCCGGG           ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","            GGGC CGGG            ","          GGG   D   GGG          ","         GG     D     GG         ","        GG             GG        ","        G               G        ","       GG               GG       ","       G                 G       ","       G                 G       ","      CC                 CC      ","        DD             DD        ","      CC                 CC      ","       G                 G       ","       G                 G       ","       GG               GG       ","        G       D       G        ","        GG      D      GG        ","         GG     D     GG         ","          GGG   D   GGG          ","            GGGC CGGG            ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","           GGGGC CGGGG           ","          GGG   D   GGG          ","         GGG    D    GGG         ","         GG  DDDDDDD  GG         ","        GG  DD     DD  GG        ","        GG  D  EEE  D  GG        ","       CCC  D EAAAE D  CCC       ","          DDD EAAAE DDD          ","       CCC  D EAAAE D  CCC       ","        GG  D  EEE  D  GG        ","        GG  DD     DD  GG        ","         GG  DDDDDDD  GG         ","         GGG    D    GGG         ","          GGG   D   GGG          ","           GGGGC CGGGG           ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","             GGC CGG             ","            GGGC CGGG            ","           GGGGC CGGGG           ","          GGGGDDDDDGGGG          ","          GGGDDCDCDDGGG          ","         CCCCDCCDCCDCCCC         ","             DDDDDDD             ","         CCCCDCCDCCDCCCC         ","          GGGDDCDCDDGGG          ","          GGGGDDDDDGGGG          ","           GGGGC CGGGG           ","            GGGC CGGG            ","             GGC CGG             ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "},
-                    {"                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","               C C               ","               C C               ","               C C               ","            CCCCCCCCC            ","               C C               ","            CCCCCCCCC            ","               C C               ","               C C               ","               C C               ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 ","                                 "}
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "             GGC CGG             ", "            GGGC CGGG            ", "           GGGGC CGGGG           ", "          GGGGDDDDDGGGG          ", "          GGGDDCDCDDGGG          ", "         CCCCDCCDCCDCCCC         ", "             DDDDDDD             ", "         CCCCDCCDCCDCCCC         ", "          GGGDDCDCDDGGG          ", "          GGGGDDDDDGGGG          ", "           GGGGC CGGGG           ", "            GGGC CGGG            ", "             GGC CGG             ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "             GGC CGG             ", "           GGGGC CGGGG           ", "          GGG   D   GGG          ", "         GGG    D    GGG         ", "         GG  DDDDDDD  GG         ", "        GG  DD     DD  GG        ", "        GG  D  EEE  D  GG        ", "       CCC  D EAAAE D  CCC       ", "          DDD EAAAE DDD          ", "       CCC  D EAAAE D  CCC       ", "        GG  D  EEE  D  GG        ", "        GG  DD     DD  GG        ", "         GG  DDDDDDD  GG         ", "         GGG    D    GGG         ", "          GGG   D   GGG          ", "           GGGGC CGGGG           ", "             GGC CGG             ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "            GGGC CGGG            ", "          GGG   D   GGG          ", "         GG     D     GG         ", "        GG             GG        ", "        G               G        ", "       GG               GG       ", "       G                 G       ", "       G                 G       ", "      CC                 CC      ", "        DD             DD        ", "      CC                 CC      ", "       G                 G       ", "       G                 G       ", "       GG               GG       ", "        G               G        ", "        GG             GG        ", "         GG     D     GG         ", "          GGG   D   GGG          ", "            GGGC CGGG            ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "           GGGCCCCCGGG           ", "         GGG    D    GGG         ", "        GG      B      GG        ", "       GG       B       GG       ", "       G                 G       ", "      GG                 GG      ", "      G                   G      ", "      G                   G      ", "      C                   C      ", "     CC                   CC     ", "      CDBB             BBDC      ", "     CC                   CC     ", "      C                   C      ", "      G                   G      ", "      G                   G      ", "      GG                 GG      ", "       G                 G       ", "       GG       B       GG       ", "        GG      B      GG        ", "         GGG    D    GGG         ", "           GGGCCCCCGGG           ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "          GGGGGC CGGGGG          ", "        GGG     D     GGG        ", "       GG    EEEBEEE    GG       ", "      GG                 GG      ", "      G                   G      ", "     GG                   GG     ", "     G                     G     ", "     G                     G     ", "     G E                 E G     ", "     G E                 E G     ", "    CC E                 E CC    ", "      DB                 BD      ", "    CC E                 E CC    ", "     G E                 E G     ", "     G E                 E G     ", "     G                     G     ", "     G                     G     ", "     GG                   GG     ", "      G                   G      ", "      GG                 GG      ", "       GG    EEEBEEE    GG       ", "        GGG     D     GGG        ", "          GGGGGC CGGGGG          ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "               C C               ", "           GGGCCCCCGGG           ", "        GGG     D     GGG        ", "       GG       B       GG       ", "      G                   G      ", "     GG                   GG     ", "     G                     G     ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "    C                       C    ", "   CC                       CC   ", "    CDB                   BDC    ", "   CC                       CC   ", "    C                       C    ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "     G                     G     ", "     GG                   GG     ", "      G                   G      ", "       GG       B       GG       ", "        GGG     D     GGG        ", "           GGGCCCCCGGG           ", "               C C               ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "               C C               ", "            GGGC CGGG            ", "         GGG    D    GGG         ", "       GG    EEEBEEE    GG       ", "      G                   G      ", "     G                     G     ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "   G E                     E G   ", "   G E                     E G   ", "  CC E                     E CC  ", "    DB                     BD    ", "  CC E                     E CC  ", "   G E                     E G   ", "   G E                     E G   ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "     G                     G     ", "      G                   G      ", "       GG    EEEBEEE    GG       ", "         GGG    D    GGG         ", "            GGGC CGGG            ", "               C C               ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "             GGC CGG             ", "          GGG   D   GGG          ", "        GG      B      GG        ", "      GG                 GG      ", "     GG                   GG     ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  C                           C  ", "   DB                       BD   ", "  C                           C  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "     GG                   GG     ", "      GG                 GG      ", "        GG      B      GG        ", "          GGG   D   GGG          ", "             GGC CGG             ", "                                 ", "                                 "},
+                    {"                                 ", "               C C               ", "           GGGGC CGGGG           ", "         GG     D     GG         ", "       GG       B       GG       ", "      G                   G      ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "  G                           G  ", " CC                           CC ", "   DB                       BD   ", " CC                           CC ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "      G                   G      ", "       GG       B       GG       ", "         GG     D     GG         ", "           GGGGC CGGGG           ", "               C C               ", "                                 "},
+                    {"                                 ", "             GGC CGG             ", "          GGG   D   GGG          ", "        GG             GG        ", "       G                 G       ", "     GG                   GG     ", "     G                     G     ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " C                             C ", "  D                           D  ", " C                             C ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "     G                     G     ", "     GG                   GG     ", "       G                 G       ", "        GG             GG        ", "          GGG   D   GGG          ", "             GGC CGG             ", "                                 "},
+                    {"                                 ", "            GGGC CGGG            ", "         GGG    D    GGG         ", "        G               G        ", "      GG                 GG      ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " G                             G ", " C                             C ", "  D                           D  ", " C                             C ", " G                             G ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "      GG                 GG      ", "        G               G        ", "         GGG    D    GGG         ", "            GGGC CGGG            ", "                                 "},
+                    {"             CCCCCCC             ", "           GGGGC CGGGG           ", "         GG  DDDDDDD  GG         ", "       GG               GG       ", "      G                   G      ", "     G                     G     ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " GD                           DG ", " GD                           DG ", "CCD                           DCC", "  D                           D  ", "CCD                           DCC", " GD                           DG ", " GD                           DG ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "     G                     G     ", "      G                   G      ", "       GG               GG       ", "         GG  DDDDDDD  GG         ", "           GGGGC CGGGG           ", "               C C               "},
+                    {"            CCHHHHHCC            ", "          GGGGDDDDDGGGG          ", "        GG  DD     DD  GG        ", "       G                 G       ", "      G                   G      ", "     G E                 E G     ", "    G                       G    ", "   G E                     E G   ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " GD                           DG ", " GD                           DG ", " D                             D ", "CD                             DC", " D                             D ", "CD                             DC", " D                             D ", " GD                           DG ", " GD                           DG ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "   G E                     E G   ", "    G                       G    ", "     G E                 E G     ", "      G                   G      ", "       G                 G       ", "        GG  DD     DD  GG        ", "          GGGGDDDDDGGGG          ", "               C C               "},
+                    {"            CHHHHHHHC            ", "          GGGDDCDCDDGGG          ", "        GG  D  EEE  D  GG        ", "       G                 G       ", "      C                   C      ", "     G E                 E G     ", "    C                       C    ", "   G E                     E G   ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " GD                           DG ", " D                             D ", " D                             D ", "CCE                           ECC", " DE                           ED ", "CCE                           ECC", " D                             D ", " D                             D ", " GD                           DG ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "   G E                     E G   ", "    C                       C    ", "     G E                 E G     ", "      C                   C      ", "       G                 G       ", "        GG  D  EEE  D  GG        ", "          GGGDDCDCDDGGG          ", "               C C               "},
+                    {"            CHHFFFHHC            ", "         CCCCDCCDCCDCCCC         ", "       CCC  D EAAAE D  CCC       ", "      CC                 CC      ", "     CC                   CC     ", "    CC E                 E CC    ", "   CC                       CC   ", "  CC E                     E CC  ", "  C                           C  ", " CC                           CC ", " C                             C ", " C                             C ", "CCD                           DCC", "CD                             DC", "CCE                           ECC", "CCA                           ACC", "CDA                           ADC", "CCA                           ACC", "CCE                           ECC", "CD                             DC", "CCD                           DCC", " C                             C ", " C                             C ", " CC                           CC ", "  C                           C  ", "  CC E                     E CC  ", "   CC                       CC   ", "    CC E                 E CC    ", "     CC                   CC     ", "      CC                 CC      ", "       CCC  D EAAAE D  CCC       ", "         CCCCDCCDCCDCCCC         ", "            CCCCCCCCC            "},
+                    {"            CHHF~FHHC            ", "             DDDDDDD             ", "          DDD EAAAE DDD          ", "        DD             DD        ", "      CDBB             BBDC      ", "      DB                 BD      ", "    CDB                   BDC    ", "    DB                     BD    ", "   DB                       BD   ", "   DB                       BD   ", "  D                           D  ", "  D                           D  ", "  D                           D  ", " D                             D ", " DE                           ED ", "CDA                           ADC", " DA                           AD ", "CDA                           ADC", " DE                           ED ", " D                             D ", "  D                           D  ", "  D                           D  ", "  D                           D  ", "   DB                       BD   ", "   DB                       BD   ", "    DB                     BD    ", "    CDB                   BDC    ", "      DB                 BD      ", "      CDBB             BBDC      ", "        DD             DD        ", "          DDD EAAAE DDD          ", "             DDDDDDD             ", "               C C               "},
+                    {"            CHHFFFHHC            ", "         CCCCDCCDCCDCCCC         ", "       CCC  D EAAAE D  CCC       ", "      CC                 CC      ", "     CC                   CC     ", "    CC E                 E CC    ", "   CC                       CC   ", "  CC E                     E CC  ", "  C                           C  ", " CC                           CC ", " C                             C ", " C                             C ", "CCD                           DCC", "CD                             DC", "CCE                           ECC", "CCA                           ACC", "CDA                           ADC", "CCA                           ACC", "CCE                           ECC", "CD                             DC", "CCD                           DCC", " C                             C ", " C                             C ", " CC                           CC ", "  C                           C  ", "  CC E                     E CC  ", "   CC                       CC   ", "    CC E                 E CC    ", "     CC                   CC     ", "      CC                 CC      ", "       CCC  D EAAAE D  CCC       ", "         CCCCDCCDCCDCCCC         ", "            CCCCCCCCC            "},
+                    {"            CHHHHHHHC            ", "          GGGDDCDCDDGGG          ", "        GG  D  EEE  D  GG        ", "       G                 G       ", "      C                   C      ", "     G E                 E G     ", "    C                       C    ", "   G E                     E G   ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " GD                           DG ", " D                             D ", " D                             D ", "CCE                           ECC", " DE                           ED ", "CCE                           ECC", " D                             D ", " D                             D ", " GD                           DG ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "   G E                     E G   ", "    C                       C    ", "     G E                 E G     ", "      C                   C      ", "       G                 G       ", "        GG  D  EEE  D  GG        ", "          GGGDDCDCDDGGG          ", "               C C               "},
+                    {"            CCHHHHHCC            ", "          GGGGDDDDDGGGG          ", "        GG  DD     DD  GG        ", "       G                 G       ", "      G                   G      ", "     G E                 E G     ", "    G                       G    ", "   G E                     E G   ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " GD                           DG ", " GD                           DG ", " D                             D ", "CD                             DC", " D                             D ", "CD                             DC", " D                             D ", " GD                           DG ", " GD                           DG ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "   G E                     E G   ", "    G                       G    ", "     G E                 E G     ", "      G                   G      ", "       G                 G       ", "        GG  DD     DD  GG        ", "          GGGGDDDDDGGGG          ", "               C C               "},
+                    {"             CCCCCCC             ", "           GGGGC CGGGG           ", "         GG  DDDDDDD  GG         ", "       GG               GG       ", "      G                   G      ", "     G                     G     ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " GD                           DG ", " GD                           DG ", "CCD                           DCC", "  D                           D  ", "CCD                           DCC", " GD                           DG ", " GD                           DG ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "     G                     G     ", "      G                   G      ", "       GG               GG       ", "         GG  DDDDDDD  GG         ", "           GGGGC CGGGG           ", "               C C               "},
+                    {"                                 ", "            GGGC CGGG            ", "         GGG    D    GGG         ", "        G               G        ", "      GG                 GG      ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " G                             G ", " C                             C ", "  D                           D  ", " C                             C ", " G                             G ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "      GG                 GG      ", "        G               G        ", "         GGG    D    GGG         ", "            GGGC CGGG            ", "                                 "},
+                    {"                                 ", "             GGC CGG             ", "          GGG   D   GGG          ", "        GG             GG        ", "       G                 G       ", "     GG                   GG     ", "     G                     G     ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  G                           G  ", " G                             G ", " G                             G ", " C                             C ", "  D                           D  ", " C                             C ", " G                             G ", " G                             G ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "     G                     G     ", "     GG                   GG     ", "       G                 G       ", "        GG             GG        ", "          GGG   D   GGG          ", "             GGC CGG             ", "                                 "},
+                    {"                                 ", "               C C               ", "           GGGGC CGGGG           ", "         GG     D     GG         ", "       GG       B       GG       ", "      G                   G      ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "  G                           G  ", " CC                           CC ", "   DB                       BD   ", " CC                           CC ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "      G                   G      ", "       GG       B       GG       ", "         GG     D     GG         ", "           GGGGC CGGGG           ", "               C C               ", "                                 "},
+                    {"                                 ", "                                 ", "             GGC CGG             ", "          GGG   D   GGG          ", "        GG      B      GG        ", "      GG                 GG      ", "     GG                   GG     ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "   G                         G   ", "   G                         G   ", "  G                           G  ", "  G                           G  ", "  C                           C  ", "   DB                       BD   ", "  C                           C  ", "  G                           G  ", "  G                           G  ", "   G                         G   ", "   G                         G   ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "     GG                   GG     ", "      GG                 GG      ", "        GG      B      GG        ", "          GGG   D   GGG          ", "             GGC CGG             ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "               C C               ", "            GGGC CGGG            ", "         GGG    D    GGG         ", "       GG    EEEBEEE    GG       ", "      G                   G      ", "     G                     G     ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "   G                         G   ", "   G E                     E G   ", "   G E                     E G   ", "  CC E                     E CC  ", "    DB                     BD    ", "  CC E                     E CC  ", "   G E                     E G   ", "   G E                     E G   ", "   G                         G   ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "     G                     G     ", "      G                   G      ", "       GG    EEEBEEE    GG       ", "         GGG    D    GGG         ", "            GGGC CGGG            ", "               C C               ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "               C C               ", "           GGGCCCCCGGG           ", "        GGG     D     GGG        ", "       GG       B       GG       ", "      G                   G      ", "     GG                   GG     ", "     G                     G     ", "     G                     G     ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "    C                       C    ", "   CC                       CC   ", "    CDB                   BDC    ", "   CC                       CC   ", "    C                       C    ", "    G                       G    ", "    G                       G    ", "    G                       G    ", "     G                     G     ", "     G                     G     ", "     GG                   GG     ", "      G                   G      ", "       GG       B       GG       ", "        GGG     D     GGG        ", "           GGGCCCCCGGG           ", "               C C               ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "          GGGGGC CGGGGG          ", "        GGG     D     GGG        ", "       GG    EEEBEEE    GG       ", "      GG                 GG      ", "      G                   G      ", "     GG                   GG     ", "     G                     G     ", "     G                     G     ", "     G E                 E G     ", "     G E                 E G     ", "    CC E                 E CC    ", "      DB                 BD      ", "    CC E                 E CC    ", "     G E                 E G     ", "     G E                 E G     ", "     G                     G     ", "     G                     G     ", "     GG                   GG     ", "      G                   G      ", "      GG                 GG      ", "       GG    EEEBEEE    GG       ", "        GGG     D     GGG        ", "          GGGGGC CGGGGG          ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "           GGGCCCCCGGG           ", "         GGG    D    GGG         ", "        GG      B      GG        ", "       GG       B       GG       ", "       G                 G       ", "      GG                 GG      ", "      G                   G      ", "      G                   G      ", "      C                   C      ", "     CC                   CC     ", "      CDBB             BBDC      ", "     CC                   CC     ", "      C                   C      ", "      G                   G      ", "      G                   G      ", "      GG                 GG      ", "       G                 G       ", "       GG       B       GG       ", "        GG      B      GG        ", "         GGG    D    GGG         ", "           GGGCCCCCGGG           ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "            GGGC CGGG            ", "          GGG   D   GGG          ", "         GG     D     GG         ", "        GG             GG        ", "        G               G        ", "       GG               GG       ", "       G                 G       ", "       G                 G       ", "      CC                 CC      ", "        DD             DD        ", "      CC                 CC      ", "       G                 G       ", "       G                 G       ", "       GG               GG       ", "        G       D       G        ", "        GG      D      GG        ", "         GG     D     GG         ", "          GGG   D   GGG          ", "            GGGC CGGG            ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "             GGC CGG             ", "           GGGGC CGGGG           ", "          GGG   D   GGG          ", "         GGG    D    GGG         ", "         GG  DDDDDDD  GG         ", "        GG  DD     DD  GG        ", "        GG  D  EEE  D  GG        ", "       CCC  D EAAAE D  CCC       ", "          DDD EAAAE DDD          ", "       CCC  D EAAAE D  CCC       ", "        GG  D  EEE  D  GG        ", "        GG  DD     DD  GG        ", "         GG  DDDDDDD  GG         ", "         GGG    D    GGG         ", "          GGG   D   GGG          ", "           GGGGC CGGGG           ", "             GGC CGG             ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "             GGC CGG             ", "            GGGC CGGG            ", "           GGGGC CGGGG           ", "          GGGGDDDDDGGGG          ", "          GGGDDCDCDDGGG          ", "         CCCCDCCDCCDCCCC         ", "             DDDDDDD             ", "         CCCCDCCDCCDCCCC         ", "          GGGDDCDCDDGGG          ", "          GGGGDDDDDGGGG          ", "           GGGGC CGGGG           ", "            GGGC CGGG            ", "             GGC CGG             ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "},
+                    {"                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "               C C               ", "               C C               ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "            CCCCCCCCC            ", "               C C               ", "               C C               ", "               C C               ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 ", "                                 "}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 10))
             .addElement('B', ofBlock(sBlockCasingsTT, 11))
             .addElement('C', ofBlock(sBlockCasingsTT, 12))
             .addElement('D', ofBlock(sBlockCasingsTT, 13))
             .addElement('E', ofBlock(sBlockCasingsTT, 14))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_bhg::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0))
             .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_bhg::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_bhg::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .build();
 
     @Override
@@ -307,8 +307,7 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E
     public void construct(ItemStack stackSize, boolean hintsOnly) {
         try {
             structureBuild_EM((stackSize.stackSize & 1) == 1 ? "main_t1" : "main_t2", 16, 16, 0, stackSize, hintsOnly);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index faa48d39de..6ad3282d9d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -57,8 +57,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
             translateToLocal("gt.blockmachines.multimachine.em.computer.hint.1"),//2 - Rack Hatches or Advanced computer casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_computer> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_computer>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_computer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_computer>builder()
             .addShape("front", transpose(new String[][]{
                     {" AA"},
                     {" AA"},
@@ -83,10 +83,10 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
                     {" AA"},
                     {" AA"}
             }))
-            .addElement('A', ofHatchAdderOptional(GT_MetaTileEntity_EM_computer::addToMachineList, textureOffset + 1, 1, sBlockCasingsTT, 1))
             .addElement('B', ofBlock(sBlockCasingsTT, 1))
             .addElement('C', ofBlock(sBlockCasingsTT, 2))
             .addElement('D', ofBlock(sBlockCasingsTT, 3))
+            .addElement('A', ofHatchAdderOptional(GT_MetaTileEntity_EM_computer::addToMachineList, textureOffset + 1, 1, sBlockCasingsTT, 1))
             .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_computer::addRackToMachineList, textureOffset + 3, 2, sBlockCasingsTT, 3))
             .build();
     //endregion
@@ -95,17 +95,17 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     protected Parameters.Group.ParameterIn overclock, overvolt;
     protected Parameters.Group.ParameterOut maxCurrentTemp, availableData;
 
-    private static final INameFunction<GT_MetaTileEntity_EM_computer> OC_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.0");//Overclock ratio
-    private static final INameFunction<GT_MetaTileEntity_EM_computer> OV_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.1");//Overvoltage ratio
-    private static final INameFunction<GT_MetaTileEntity_EM_computer> MAX_TEMP_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.0");//Current max. heat
-    private static final INameFunction<GT_MetaTileEntity_EM_computer> COMPUTE_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.1");//Produced computation
-    private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OC_STATUS =
+    private static final INameFunction<GT_MetaTileEntity_EM_computer>   OC_NAME         = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.0");//Overclock ratio
+    private static final INameFunction<GT_MetaTileEntity_EM_computer>   OV_NAME         = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgi.1");//Overvoltage ratio
+    private static final INameFunction<GT_MetaTileEntity_EM_computer>   MAX_TEMP_NAME   = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.0");//Current max. heat
+    private static final INameFunction<GT_MetaTileEntity_EM_computer>   COMPUTE_NAME    = (base, p) -> translateToLocal("gt.blockmachines.multimachine.em.computer.cfgo.1");//Produced computation
+    private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OC_STATUS       =
             (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), 0, 1, 1, 3);
-    private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OV_STATUS =
+    private static final IStatusFunction<GT_MetaTileEntity_EM_computer> OV_STATUS       =
             (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), .7, .8, 1.2, 2);
     private static final IStatusFunction<GT_MetaTileEntity_EM_computer> MAX_TEMP_STATUS =
             (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), -10000, 0, 0, 5000);
-    private static final IStatusFunction<GT_MetaTileEntity_EM_computer> COMPUTE_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_EM_computer> COMPUTE_STATUS  = (base, p) -> {
         if (base.eAvailableData < 0) {
             return STATUS_TOO_LOW;
         }
@@ -185,7 +185,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPostTick(aBaseMetaTileEntity, aTick);
-        if(aBaseMetaTileEntity.isServerSide() && mMachine && !aBaseMetaTileEntity.isActive() && aTick % 20 == MULTI_CHECK_AT){
+        if (aBaseMetaTileEntity.isServerSide() && mMachine && !aBaseMetaTileEntity.isActive() && aTick % 20 == MULTI_CHECK_AT) {
             double maxTemp = 0;
             for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) {
                 if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) {
@@ -203,8 +203,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     public boolean checkRecipe_EM(ItemStack itemStack) {
         parametrization.setToDefaults(false, true);
         eAvailableData = 0;
-        double maxTemp = 0;
-        double overClockRatio = overclock.get();
+        double maxTemp          = 0;
+        double overClockRatio   = overclock.get();
         double overVoltageRatio = overvolt.get();
         if (Double.isNaN(overClockRatio) || Double.isNaN(overVoltageRatio)) {
             return false;
@@ -218,7 +218,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
                 return false;
             }
             short thingsActive = 0;
-            int rackComputation;
+            int   rackComputation;
 
             for (GT_MetaTileEntity_Hatch_Rack rack : eRacks) {
                 if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(rack)) {
@@ -268,8 +268,8 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     public void outputAfterRecipe_EM() {
         if (!eOutputData.isEmpty()) {
             Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity().getXCoord(),
-                                        getBaseMetaTileEntity().getYCoord(),
-                                        getBaseMetaTileEntity().getZCoord());
+                    getBaseMetaTileEntity().getYCoord(),
+                    getBaseMetaTileEntity().getZCoord());
 
             QuantumDataPacket pack = new QuantumDataPacket(eAvailableData / eOutputData.size()).unifyTraceWith(pos);
             if (pack == null) {
@@ -388,7 +388,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
 
         byte offset = -2;
         for (int rackSlices = Math.min(stackSize.stackSize, 12); rackSlices > 0; rackSlices--) {
-            structureBuild_EM("slice", 1 , 2, offset--, stackSize, hintsOnly);
+            structureBuild_EM("slice", 1, 2, offset--, stackSize, hintsOnly);
         }
 
         structureBuild_EM("cap", 1, 2, offset--, stackSize, hintsOnly);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java
index 65870f9e76..014e2b3a65 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_crafting.java
@@ -42,23 +42,23 @@ public class GT_MetaTileEntity_EM_crafting extends GT_MetaTileEntity_MultiblockB
             translateToLocal("gt.blockmachines.multimachine.em.crafter.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_crafting> STRUCTURE_DEFINITION=
-            IStructureDefinition.<GT_MetaTileEntity_EM_crafting>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_crafting> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_crafting>builder()
             .addShape("main", transpose(new String[][]{
-                    {" AAA ","AAAAA","A   A","BBBBB","BGCGB","BGGGB","BGCGB","BBBBB","A   A","AAAAA"," AAA "},
-                    {"AHHHA","AAAAA"," FFF ","BBBBB","GGGGG","GGGGG","GGGGG","BBBBB"," FFF ","AAAAA","AHHHA"},
-                    {"AH~HA","AAAAA"," FEF ","BBEBB","CGEGC","GGDGG","CGEGC","BBEBB"," FEF ","AAAAA","AHHHA"},
-                    {"AHHHA","AAAAA"," FFF ","BBBBB","GGGGG","GGGGG","GGGGG","BBBBB"," FFF ","AAAAA","AHHHA"},
-                    {" AAA ","AAAAA","A   A","BBBBB","BGCGB","BGGGB","BGCGB","BBBBB","A   A","AAAAA"," AAA "}
+                    {" AAA ", "AAAAA", "A   A", "BBBBB", "BGCGB", "BGGGB", "BGCGB", "BBBBB", "A   A", "AAAAA", " AAA "},
+                    {"AHHHA", "AAAAA", " FFF ", "BBBBB", "GGGGG", "GGGGG", "GGGGG", "BBBBB", " FFF ", "AAAAA", "AHHHA"},
+                    {"AH~HA", "AAAAA", " FEF ", "BBEBB", "CGEGC", "GGDGG", "CGEGC", "BBEBB", " FEF ", "AAAAA", "AHHHA"},
+                    {"AHHHA", "AAAAA", " FFF ", "BBBBB", "GGGGG", "GGGGG", "GGGGG", "BBBBB", " FFF ", "AAAAA", "AHHHA"},
+                    {" AAA ", "AAAAA", "A   A", "BBBBB", "BGCGB", "BGGGB", "BGCGB", "BBBBB", "A   A", "AAAAA", " AAA "}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 4))
             .addElement('B', ofBlock(sBlockCasingsTT, 5))
             .addElement('C', ofBlock(sBlockCasingsTT, 6))
             .addElement('D', ofBlock(sBlockCasingsTT, 9))
             .addElement('E', ofBlock(sBlockCasingsTT, 10))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_crafting::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .addElement('G', ofBlock(QuantumGlassBlock.INSTANCE, 0))
             .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_crafting::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_crafting::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .build();
     //endregion
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
index 84e6026448..9a9747f012 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
@@ -39,7 +39,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region variables
     private final ArrayList<GT_MetaTileEntity_Hatch_OutputDataItems> eStacksDataOutputs = new ArrayList<>();
-    private final ArrayList<GT_MetaTileEntity_Hatch_DataAccess> eDataAccessHatches = new ArrayList<>();
+    private final ArrayList<GT_MetaTileEntity_Hatch_DataAccess>      eDataAccessHatches = new ArrayList<>();
     //endregion
 
     //region structure
@@ -49,12 +49,12 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB
             translateToLocal("gt.blockmachines.multimachine.em.databank.hint.1"),//2 - Data Access/Data Bank Master Hatches or computer casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_dataBank> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_dataBank>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_dataBank> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_dataBank>builder()
             .addShape("main", transpose(new String[][]{
-                    {"BCCCB","BDDDB","BDDDB"},
-                    {"BC~CB","BAAAB","BDDDB"},
-                    {"BCCCB","BDDDB","BDDDB"}
+                    {"BCCCB", "BDDDB", "BDDDB"},
+                    {"BC~CB", "BAAAB", "BDDDB"},
+                    {"BCCCB", "BDDDB", "BDDDB"}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 1))
             .addElement('B', ofBlock(sBlockCasingsTT, 2))
@@ -130,12 +130,12 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity,true,  false, true);
+        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, true, false, true);
     }
 
     @Override
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png",true, false, true);//todo texture
+        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png", true, false, true);//todo texture
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
index 0b8a521581..18b0047ef4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_decay.java
@@ -65,8 +65,8 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
             translateToLocal("gt.blockmachines.multimachine.em.decay.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_decay> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_decay>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_decay> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_decay>builder()
             .addShape("main",transpose(new String[][]{
                     {"A   A","AAAAA","A   A","ABBBA","ABCBA","ABBBA","A   A","AAAAA","A   A"},
                     {" FFF ","AAAAA"," EEE ","BDDDB","BDDDB","BDDDB"," EEE ","AAAAA"," FFF "},
@@ -78,8 +78,8 @@ public class GT_MetaTileEntity_EM_decay extends GT_MetaTileEntity_MultiblockBase
             .addElement('B', ofBlock(sBlockCasingsTT, 5))
             .addElement('C', ofBlock(sBlockCasingsTT, 6))
             .addElement('D', ofBlock(sBlockCasingsTT, 8))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_decay::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_decay::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_decay::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .build();
     //endregion
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
index ba1ac8b298..5a045102ef 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dequantizer.java
@@ -43,20 +43,20 @@ public class GT_MetaTileEntity_EM_dequantizer extends GT_MetaTileEntity_Multiblo
     //region structure
     //use multi A energy inputs, use less power the longer it runs
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_dequantizer> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_dequantizer>builder()
-                    .addShape("main", transpose(new String[][]{
-                            {"CCC", "ABA", "EEE", "BDB"},
-                            {"C~C", "BBB", "EBE", "DFD"},
-                            {"CCC", "ABA", "EEE", "BDB"}
-                    }))
-                    .addElement('A', ofBlock(sBlockCasingsTT, 0))
-                    .addElement('B', ofBlock(sBlockCasingsTT, 4))
-                    .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-                    .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
-                    .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList, textureOffset + 4, 2))
-                    .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-                    .build();
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_dequantizer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_dequantizer>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"CCC", "ABA", "EEE", "BDB"},
+                    {"C~C", "BBB", "EBE", "DFD"},
+                    {"CCC", "ABA", "EEE", "BDB"}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 0))
+            .addElement('B', ofBlock(sBlockCasingsTT, 4))
+            .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_dequantizer::addElementalInputToMachineList, textureOffset + 4, 2))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_dequantizer::addElementalMufflerToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
+            .build();
 
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
index 207768323b..f6833d2cb9 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
@@ -40,14 +40,14 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa
             translateToLocal("gt.blockmachines.multimachine.em.infuser.hint"),//1 - Classic Hatches or High Power Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_infuser> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_infuser>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_infuser> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_infuser>builder()
             .addShape("main", transpose(new String[][]{
-                    {"CCC","CCC","CCC"},
-                    {"BBB","BAB","BBB"},
-                    {"A~A","AAA","AAA"},
-                    {"BBB","BAB","BBB"},
-                    {"CCC","CCC","CCC"}
+                    {"CCC", "CCC", "CCC"},
+                    {"BBB", "BAB", "BBB"},
+                    {"A~A", "AAA", "AAA"},
+                    {"BBB", "BAB", "BBB"},
+                    {"CCC", "CCC", "CCC"}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 4))
             .addElement('B', ofBlock(sBlockCasingsTT, 7))
@@ -169,12 +169,12 @@ public class GT_MetaTileEntity_EM_infuser extends GT_MetaTileEntity_MultiblockBa
 
     @Override
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity,true,  false, true);
+        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, true, false, true);
     }
 
     @Override
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png",true,  false, true);
+        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png", true, false, true);
     }
 
     public final static ResourceLocation activitySound = new ResourceLocation(Reference.MODID + ":fx_whooum");
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index a3944c6e31..62ecd507c2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -35,8 +35,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
             translateToLocal("gt.blockmachines.multimachine.em.junction.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_junction> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_junction>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_junction> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_junction>builder()
             .addShape("main", new String[][]{
                     {"CCC", "C~C", "CCC"},
                     {"AAA", "AAA", "AAA"},
@@ -58,7 +58,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region parameters
-    private static final INameFunction<GT_MetaTileEntity_EM_junction> ROUTE_NAME =
+    private static final INameFunction<GT_MetaTileEntity_EM_junction>   ROUTE_NAME =
             (base, p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Source") + " " : translateToLocal("tt.keyword.Destination") + " ") + p.hatchId();
     private static final IStatusFunction<GT_MetaTileEntity_EM_junction> SRC_STATUS =
             (base, p) -> {
@@ -83,8 +83,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                 }
                 return STATUS_NEUTRAL;
             };
-    protected Parameters.Group.ParameterIn[] src;
-    protected Parameters.Group.ParameterIn[] dst;
+    protected            Parameters.Group.ParameterIn[]                 src;
+    protected            Parameters.Group.ParameterIn[]                 dst;
     //endregion
 
     public GT_MetaTileEntity_EM_junction(int aID, String aName, String aNameRegional) {
@@ -138,8 +138,8 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
             if (inIndex < 0 || inIndex >= eInputHatches.size()) {
                 continue;
             }
-            int outIndex = (int) dst - 1;
-            GT_MetaTileEntity_Hatch_InputElemental in = eInputHatches.get(inIndex);
+            int                                    outIndex = (int) dst - 1;
+            GT_MetaTileEntity_Hatch_InputElemental in       = eInputHatches.get(inIndex);
             if (outIndex == -1) {//param==0 -> null the content
                 cleanHatchContentEM_EM(in);
             } else {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index 64bce35ca0..dc218da530 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -49,19 +49,19 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
     //use multi A energy inputs, use less power the longer it runs
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_quantizer> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_quantizer>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_quantizer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_quantizer>builder()
             .addShape("main", transpose(new String[][]{
-                    {"CCC","BAB","EEE","DBD"},
-                    {"C~C","ABA","EBE","BFB"},
-                    {"CCC","BAB","EEE","DBD"}
+                    {"CCC", "BAB", "EEE", "DBD"},
+                    {"C~C", "ABA", "EBE", "BFB"},
+                    {"CCC", "BAB", "EEE", "DBD"}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 0))
             .addElement('B', ofBlock(sBlockCasingsTT, 4))
-            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_quantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_quantizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList, textureOffset + 4, 2))
             .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_quantizer::addElementalMufflerToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_quantizer::addElementalOutputToMachineList,textureOffset + 4, 2))
             .build();
 
     private static final String[] description = new String[]{
@@ -94,7 +94,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
     public boolean checkRecipe_EM(ItemStack itemStack) {//TODO implement instance quantization
         if (GregTech_API.sPostloadFinished) {
             ArrayList<ItemStack> storedInputs = getStoredInputs();
-            ItemStack[] inI = storedInputs.toArray(nullItem);
+            ItemStack[]          inI          = storedInputs.toArray(nullItem);
             if (inI.length > 0) {
                 for (ItemStack is : inI) {
                     //ITEM STACK quantization
@@ -133,7 +133,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
                 }
             }
             ArrayList<FluidStack> storedFluids = getStoredFluids();
-            FluidStack[] inF = storedFluids.toArray(nullFluid);
+            FluidStack[]          inF          = storedFluids.toArray(nullFluid);
             if (inF.length > 0) {
                 for (FluidStack fs : inF) {
                     EMFluidQuantizationInfo aFQI = TecTech.transformationInfo.getFluidQuantization().get(fs.getFluid().getID());
@@ -155,7 +155,7 @@ public class GT_MetaTileEntity_EM_quantizer extends GT_MetaTileEntity_Multiblock
     private void startRecipe(IEMStack into) {
         mMaxProgresstime = 20;
         mEfficiencyIncrease = 10000;
-        double mass = into.getMass();
+        double mass   = into.getMass();
         double euMult = Math.abs(mass / refMass);
         eAmpereFlow = (int) Math.ceil(Math.sqrt(Math.sqrt(euMult)));
         if (mass > refUnstableMass || into.getDefinition().getRawTimeSpan(DEFAULT_ENERGY_LEVEL) < STABLE_RAW_LIFE_TIME) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
index 33660d838f..9cd3bf40e7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java
@@ -53,13 +53,13 @@ import static net.minecraft.util.StatCollector.translateToLocalFormatted;
  */
 public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region variables
-    private final ArrayList<GT_MetaTileEntity_Hatch_Holder> eHolders = new ArrayList<>();
-    private GT_Recipe.GT_Recipe_AssemblyLine tRecipe;
-    private TT_recipe.TT_assLineRecipe aRecipe;
-    private String machineType;
-    private static final String assembly="Assembly line";
-    private ItemStack holdItem;
-    private long computationRemaining, computationRequired;
+    private final        ArrayList<GT_MetaTileEntity_Hatch_Holder> eHolders = new ArrayList<>();
+    private              GT_Recipe.GT_Recipe_AssemblyLine          tRecipe;
+    private              TT_recipe.TT_assLineRecipe                aRecipe;
+    private              String                                    machineType;
+    private static final String                                    assembly = "Assembly line";
+    private              ItemStack                                 holdItem;
+    private              long                                      computationRemaining, computationRequired;
 
     private static LinkedHashMap<String, String> lServerNames;
 
@@ -73,23 +73,23 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region structure
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_research> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_research>builder()
-                    .addShape("main", transpose(new String[][]{
-                            {"   ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"},
-                            {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"},
-                            {"   ", " C ", "   ", "   ", "ACA", "CCC", "DDD"},
-                            {"   ", " E ", "   ", "   ", "A~A", "CCC", "DDD"},
-                            {"   ", " C ", "   ", "   ", "ACA", "CCC", "DDD"},
-                            {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"},
-                            {"   ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"}
-                    }))
-                    .addElement('A', ofBlock(sBlockCasingsTT, 1))
-                    .addElement('B', ofBlock(sBlockCasingsTT, 2))
-                    .addElement('C', ofBlock(sBlockCasingsTT, 3))
-                    .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_research::addClassicToMachineList, textureOffset + 1,1, sBlockCasingsTT,1))
-                    .addElement('E', ofHatchAdder(GT_MetaTileEntity_EM_research::addHolderToMachineList, 3, 2))
-                    .build();
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_research> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_research>builder()
+            .addShape("main", transpose(new String[][]{
+                    {"   ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"},
+                    {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"},
+                    {"   ", " C ", "   ", "   ", "ACA", "CCC", "DDD"},
+                    {"   ", " E ", "   ", "   ", "A~A", "CCC", "DDD"},
+                    {"   ", " C ", "   ", "   ", "ACA", "CCC", "DDD"},
+                    {"AAA", "ACA", "ACA", "ACA", "BCB", "BCB", "BBB"},
+                    {"   ", " A ", " A ", "AAA", "AAA", "AAA", "AAA"}
+            }))
+            .addElement('A', ofBlock(sBlockCasingsTT, 1))
+            .addElement('B', ofBlock(sBlockCasingsTT, 2))
+            .addElement('C', ofBlock(sBlockCasingsTT, 3))
+            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_research::addClassicToMachineList, textureOffset + 1, 1, sBlockCasingsTT, 1))
+            .addElement('E', ofHatchAdder(GT_MetaTileEntity_EM_research::addHolderToMachineList, 3, 2))
+            .build();
     //endregion
 
     public GT_MetaTileEntity_EM_research(int aID, String aName, String aNameRegional) {
@@ -143,12 +143,12 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
     private void makeStick2() {
         String s = tRecipe.mOutput.getDisplayName();
         if (getBaseMetaTileEntity().isServerSide()) {
-            if(lServerNames != null) {
+            if (lServerNames != null) {
                 s = lServerNames.get(tRecipe.mOutput.getDisplayName());
                 if (s == null) {
                     s = tRecipe.mOutput.getDisplayName();
                 }
-            }else{
+            } else {
                 s = tRecipe.mOutput.getDisplayName();
             }
         }
@@ -187,7 +187,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
         tNBTList.appendTag(new NBTTagString("Construction plan for " + tRecipe.mOutput.stackSize + " " + s + ". Needed EU/t: " + tRecipe.mEUt + " Production time: " + (tRecipe.mDuration / 20)));
         for (int i = 0; i < tRecipe.mInputs.length; i++) {
             if (tRecipe.mOreDictAlt[i] != null) {
-                int count = 0;
+                int           count    = 0;
                 StringBuilder tBuilder = new StringBuilder("Input Bus " + (i + 1) + ": ");
                 for (ItemStack tStack : tRecipe.mOreDictAlt[i]) {
                     if (tStack != null) {
@@ -240,7 +240,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
                 mEfficiencyIncrease = 10000;
                 eRequiredData = (short) (ttRecipe.mSpecialValue >>> 16);
                 eAmpereFlow = (short) (ttRecipe.mSpecialValue & 0xFFFF);
-                mEUt = Math.min(ttRecipe.mEUt,-ttRecipe.mEUt);
+                mEUt = Math.min(ttRecipe.mEUt, -ttRecipe.mEUt);
                 eHolders.get(0).getBaseMetaTileEntity().setActive(true);
                 return true;
             }
@@ -362,7 +362,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB
     @Override
     public String[] getInfoData() {
         long storedEnergy = 0;
-        long maxEnergy = 0;
+        long maxEnergy    = 0;
         for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) {
             if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
                 storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 68e7519950..8d4f86c164 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -57,15 +57,15 @@ import static net.minecraft.util.StatCollector.translateToLocalFormatted;
 public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region variables
     public static final int SCAN_DO_NOTHING = 0,
-            SCAN_GET_NOMENCLATURE = 1, SCAN_GET_DEPTH_LEVEL = 2, SCAN_GET_AMOUNT = 4, SCAN_GET_CHARGE = 8,
-            SCAN_GET_MASS = 16, SCAN_GET_ENERGY_LEVEL = 32, SCAN_GET_TIMESPAN_INFO = 64, SCAN_GET_ENERGY_STATES = 128,
-            SCAN_GET_COLOR = 256, SCAN_GET_AGE = 512, SCAN_GET_TIMESPAN_MULT = 1024, SCAN_GET_CLASS_TYPE = 2048;
+            SCAN_GET_NOMENCLATURE           = 1, SCAN_GET_DEPTH_LEVEL = 2, SCAN_GET_AMOUNT = 4, SCAN_GET_CHARGE = 8,
+            SCAN_GET_MASS                   = 16, SCAN_GET_ENERGY_LEVEL = 32, SCAN_GET_TIMESPAN_INFO = 64, SCAN_GET_ENERGY_STATES = 128,
+            SCAN_GET_COLOR                  = 256, SCAN_GET_AGE = 512, SCAN_GET_TIMESPAN_MULT = 1024, SCAN_GET_CLASS_TYPE = 2048;
 
     private TT_recipe.TT_EMRecipe.TT_EMRecipe eRecipe;
     private EMDefinitionStack                 objectResearched;
     private EMInstanceStackMap                objectsScanned;
-    private String                    machineType;
-    private long computationRemaining, computationRequired;
+    private String                            machineType;
+    private long                              computationRemaining, computationRequired;
     private int[] scanComplexity;
 
     private String clientLocale = "en_US";
@@ -80,27 +80,27 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             translateToLocal("gt.blockmachines.multimachine.em.scanner.hint.3"),//4 - Elemental Overflow Hatches or Molecular Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_scanner> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_scanner>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_scanner> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_scanner>builder()
             .addShape("main", transpose(new String[][]{
-                    {"CCCCC","BBBBB","BBDBB","BDDDB","BDDDB","BDDDB","BBDBB","EEEEE"},
-                    {"CAAAC","BBBBB","BDDDB","D---D","D---D","D---D","BDDDB","EBBBE"},
-                    {"CA~AC","BBBBB","DDDDD","D---D","D---D","D---D","DDGDD","EBFBE"},
-                    {"CAAAC","BBBBB","BDDDB","D---D","D---D","D---D","BDDDB","EBBBE"},
-                    {"CCCCC","BBBBB","BBDBB","BDDDB","BDDDB","BDDDB","BBDBB","EEEEE"}
+                    {"CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE"},
+                    {"CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE"},
+                    {"CA~AC", "BBBBB", "DDDDD", "D---D", "D---D", "D---D", "DDGDD", "EBFBE"},
+                    {"CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE"},
+                    {"CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE"}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 0))
             .addElement('B', ofBlock(sBlockCasingsTT, 4))
-            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('D', ofBlock(QuantumGlassBlock.INSTANCE, 0))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList, textureOffset + 4, 4, sBlockCasingsTT, 4))
+            .addElement('C', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('F', ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalInputToMachineList, textureOffset + 4, 2))
             .addElement('G', ofHatchAdder(GT_MetaTileEntity_EM_scanner::addElementalOutputToMachineList, textureOffset + 4, 3))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_scanner::addElementalMufflerToMachineList, textureOffset + 4, 4, sBlockCasingsTT, 4))
             .build();
     //endregion
 
     //region parameters
-    private static final INameFunction<GT_MetaTileEntity_EM_scanner> CONFIG_NAME =
+    private static final INameFunction<GT_MetaTileEntity_EM_scanner>   CONFIG_NAME   =
             (base, p) -> "Config at Depth: " + (p.hatchId() * 2 + p.parameterId());
     private static final IStatusFunction<GT_MetaTileEntity_EM_scanner> CONFIG_STATUS =
             (base, p) -> {
@@ -114,7 +114,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
                 if (v < 0) return LedStatus.STATUS_TOO_LOW;
                 return LedStatus.STATUS_OK;
             };
-    protected Parameters.Group.ParameterIn[] scanConfiguration;
+    protected            Parameters.Group.ParameterIn[]                scanConfiguration;
     //endregion
 
     public GT_MetaTileEntity_EM_scanner(int aID, String aName, String aNameRegional) {
@@ -130,9 +130,9 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     private void quantumStuff(boolean shouldExist) {
         IGregTechTileEntity base = getBaseMetaTileEntity();
         if (base != null && base.getWorld() != null) {
-            int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 4 + base.getXCoord();
-            int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 4 + base.getYCoord();
-            int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 4 + base.getZCoord();
+            int   xDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 4 + base.getXCoord();
+            int   yDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 4 + base.getYCoord();
+            int   zDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 4 + base.getZCoord();
             Block block = base.getWorld().getBlock(xDir, yDir, zDir);
             if (shouldExist) {
                 if (block != null && block.getMaterial() == Material.air) {
@@ -332,7 +332,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
     @Override
     public String[] getInfoData() {
         long storedEnergy = 0;
-        long maxEnergy = 0;
+        long maxEnergy    = 0;
         for (GT_MetaTileEntity_Hatch_Energy tHatch : mEnergyHatches) {
             if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) {
                 storedEnergy += tHatch.getBaseMetaTileEntity().getStoredEU();
@@ -420,7 +420,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         computationRemaining = aNBT.getLong("eComputationRemaining");
         computationRequired = aNBT.getLong("eComputationRequired");
         if (aNBT.hasKey("eObject")) {
-            objectResearched = EMDefinitionStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eObject"));
+            objectResearched = EMDefinitionStack.fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eObject"));
             if (objectResearched.getDefinition() == EMPrimitiveDefinition.nbtE__) {
                 objectResearched = null;
             }
@@ -434,7 +434,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
         }
         try {
             if (aNBT.hasKey("eScanObjects")) {
-                objectsScanned = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eScanObjects"));
+                objectsScanned = EMInstanceStackMap.fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eScanObjects"));
             }
         } catch (EMException e) {
             objectsScanned = new EMInstanceStackMap();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java
index 6bedce3ede..7103e6dfff 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_stabilizer.java
@@ -28,21 +28,21 @@ public class GT_MetaTileEntity_EM_stabilizer extends GT_MetaTileEntity_Multibloc
             translateToLocal("gt.blockmachines.multimachine.em.stabilizer.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_stabilizer> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_stabilizer>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_stabilizer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_stabilizer>builder()
             .addShape("main", transpose(new String[][]{
-                    {" AFA ","BCBCB","FBGBF","BCBCB"," AFA "},
-                    {"AEEEA","CBBBC","BBDBB","CBBBC","AEEEA"},
-                    {"FE~EF","BBBBB","GDDDG","BBBBB","FEEEF"},
-                    {"AEEEA","CBBBC","BBDBB","CBBBC","AEEEA"},
-                    {" AFA ","BCBCB","FBGBF","BCBCB"," AFA "}
+                    {" AFA ", "BCBCB", "FBGBF", "BCBCB", " AFA "},
+                    {"AEEEA", "CBBBC", "BBDBB", "CBBBC", "AEEEA"},
+                    {"FE~EF", "BBBBB", "GDDDG", "BBBBB", "FEEEF"},
+                    {"AEEEA", "CBBBC", "BBDBB", "CBBBC", "AEEEA"},
+                    {" AFA ", "BCBCB", "FBGBF", "BCBCB", " AFA "}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 4))
             .addElement('B', ofBlock(sBlockCasingsTT, 5))
             .addElement('C', ofBlock(sBlockCasingsTT, 6))
             .addElement('D', ofBlock(sBlockCasingsTT, 9))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_stabilizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_stabilizer::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('G', ofHatchAdderOptional(GT_MetaTileEntity_EM_stabilizer::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .build();
     //endregion
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java
index bd38a46b7f..bbf33c6ae7 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java
@@ -43,12 +43,12 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas
             "1 - Classic/Data Hatches or Computer casing",//1 - Classic/Data Hatches or Computer casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_switch> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_switch>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_switch> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_switch>builder()
             .addShape("main", transpose(new String[][]{
-                    {"BBB","BBB","BBB"},
-                    {"B~B","BAB","BBB"},
-                    {"BBB","BBB","BBB"}
+                    {"BBB", "BBB", "BBB"},
+                    {"B~B", "BAB", "BBB"},
+                    {"BBB", "BBB", "BBB"}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 3))
             .addElement('B', ofHatchAdderOptional(GT_MetaTileEntity_EM_switch::addClassicToMachineList, textureOffset + 1, 1, sBlockCasingsTT, 1))
@@ -56,7 +56,7 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas
     //endregion
 
     //region parameters
-    private static final INameFunction<GT_MetaTileEntity_EM_switch> ROUTE_NAME =
+    private static final INameFunction<GT_MetaTileEntity_EM_switch>   ROUTE_NAME =
             (base, p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Destination") + " " : translateToLocal("tt.keyword.Weight") + " ") + p.hatchId();
     private static final IStatusFunction<GT_MetaTileEntity_EM_switch> WEI_STATUS =
             (base, p) -> {
@@ -79,8 +79,8 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas
                 }
                 return STATUS_NEUTRAL;
             };
-    protected Parameters.Group.ParameterIn[] dst;
-    protected Parameters.Group.ParameterIn[] weight;
+    protected            Parameters.Group.ParameterIn[]               dst;
+    protected            Parameters.Group.ParameterIn[]               weight;
     //endregion
 
     public GT_MetaTileEntity_EM_switch(int aID, String aName, String aNameRegional) {
@@ -134,8 +134,8 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas
             }
 
             Vec3Impl pos = new Vec3Impl(getBaseMetaTileEntity().getXCoord(),
-                                        getBaseMetaTileEntity().getYCoord(),
-                                        getBaseMetaTileEntity().getZCoord());
+                    getBaseMetaTileEntity().getYCoord(),
+                    getBaseMetaTileEntity().getZCoord());
 
             QuantumDataPacket pack = new QuantumDataPacket(0L).unifyTraceWith(pos);
             if (pack == null) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
index 208d33c610..75eb05bdeb 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
@@ -32,24 +32,24 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  */
 public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
     //region structure
-    private static final String[] description = new String[]{
+    private static final String[]                                               description          = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.em.transformer.hint"),//1 - Energy IO Hatches or High Power Casing
     };
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_transformer> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_transformer>builder()
-                    .addShape("main",new String[][]{
-                            {"111", "1~1", "111",},
-                            {"111", "101", "111",},
-                            {"111", "111", "111",},
-                    })
-                    .addElement('0', ofBlock(sBlockCasings1,15))
-                    .addElement('1', ofChain(
-                            ofHatchAdder(GT_MetaTileEntity_EM_transformer::addEnergyIOToMachineList,textureOffset,1),
-                            onElementPass(t->t.casingCount++,ofBlock(sBlockCasingsTT,0))
-                    ))
-                    .build();
-    private int casingCount=0;
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_transformer> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_transformer>builder()
+            .addShape("main", new String[][]{
+                    {"111", "1~1", "111",},
+                    {"111", "101", "111",},
+                    {"111", "111", "111",},
+            })
+            .addElement('0', ofBlock(sBlockCasings1, 15))
+            .addElement('1', ofChain(
+                    ofHatchAdder(GT_MetaTileEntity_EM_transformer::addEnergyIOToMachineList, textureOffset, 1),
+                    onElementPass(t -> t.casingCount++, ofBlock(sBlockCasingsTT, 0))
+            ))
+            .build();
+    private              int                                                    casingCount          = 0;
 
     @Override
     public IStructureDefinition<GT_MetaTileEntity_EM_transformer> getStructure_EM() {
@@ -86,8 +86,8 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        casingCount=0;
-        return structureCheck_EM("main", 1, 1, 0) && casingCount>=5;
+        casingCount = 0;
+        return structureCheck_EM("main", 1, 1, 0) && casingCount >= 5;
     }
 
     @Override
@@ -116,12 +116,12 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo
 
     @Override
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity,true,  false, false);
+        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, true, false, false);
     }
 
     @Override
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png",true,  false, false);
+        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png", true, false, false);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
index 502a300bb3..83151d71c3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_wormhole.java
@@ -40,25 +40,25 @@ public class GT_MetaTileEntity_EM_wormhole extends GT_MetaTileEntity_MultiblockB
             translateToLocal("gt.blockmachines.multimachine.em.wormhole.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_wormhole> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_wormhole>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_wormhole> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_wormhole>builder()
             .addShape("main", transpose(new String[][]{
-                    {"         ","         ","         ","         ","         ","    D    ","  DDDDD  ","  DGGGD  ","  DGGGD  ","  DGGGD  ","  DDDDD  "},
-                    {"         ","         ","         ","    D    ","    D    ","    D    "," DDAAADD "," EABBBAE "," EABBBAE "," EABBBAE "," DDAAADD "},
-                    {"         ","    D    ","    D    ","    D    ","         ","         ","DDA   ADD","DABFFFBAD","DABCCCBAD","DABFFFBAD","DDA   ADD"},
-                    {"   EEE   ","   DDD   ","   F F   ","         ","         ","         ","DA     AD","GBF   FBG","GBC   CBG","GBF   FBG","DA     AD"},
-                    {"   E~E   ","  DDBDD  ","  D   D  "," DD   DD "," D     D ","DD     DD","DA     AD","GBF   FBG","GBC   CBG","GBF   FBG","DA     AD"},
-                    {"   EEE   ","   DDD   ","   F F   ","         ","         ","         ","DA     AD","GBF   FBG","GBC   CBG","GBF   FBG","DA     AD"},
-                    {"         ","    D    ","    D    ","    D    ","         ","         ","DDA   ADD","DABFFFBAD","DABCCCBAD","DABFFFBAD","DDA   ADD"},
-                    {"         ","         ","         ","    D    ","    D    ","    D    "," DDAAADD "," EABBBAE "," EABBBAE "," EABBBAE "," DDAAADD "},
-                    {"         ","         ","         ","         ","         ","    D    ","  DDDDD  ","  DGGGD  ","  DGGGD  ","  DGGGD  ","  DDDDD  "}
+                    {"         ", "         ", "         ", "         ", "         ", "    D    ", "  DDDDD  ", "  DGGGD  ", "  DGGGD  ", "  DGGGD  ", "  DDDDD  "},
+                    {"         ", "         ", "         ", "    D    ", "    D    ", "    D    ", " DDAAADD ", " EABBBAE ", " EABBBAE ", " EABBBAE ", " DDAAADD "},
+                    {"         ", "    D    ", "    D    ", "    D    ", "         ", "         ", "DDA   ADD", "DABFFFBAD", "DABCCCBAD", "DABFFFBAD", "DDA   ADD"},
+                    {"   EEE   ", "   DDD   ", "   F F   ", "         ", "         ", "         ", "DA     AD", "GBF   FBG", "GBC   CBG", "GBF   FBG", "DA     AD"},
+                    {"   E~E   ", "  DDBDD  ", "  D   D  ", " DD   DD ", " D     D ", "DD     DD", "DA     AD", "GBF   FBG", "GBC   CBG", "GBF   FBG", "DA     AD"},
+                    {"   EEE   ", "   DDD   ", "   F F   ", "         ", "         ", "         ", "DA     AD", "GBF   FBG", "GBC   CBG", "GBF   FBG", "DA     AD"},
+                    {"         ", "    D    ", "    D    ", "    D    ", "         ", "         ", "DDA   ADD", "DABFFFBAD", "DABCCCBAD", "DABFFFBAD", "DDA   ADD"},
+                    {"         ", "         ", "         ", "    D    ", "    D    ", "    D    ", " DDAAADD ", " EABBBAE ", " EABBBAE ", " EABBBAE ", " DDAAADD "},
+                    {"         ", "         ", "         ", "         ", "         ", "    D    ", "  DDDDD  ", "  DGGGD  ", "  DGGGD  ", "  DGGGD  ", "  DDDDD  "}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 5))
             .addElement('B', ofBlock(sBlockCasingsTT, 10))
             .addElement('C', ofBlock(sBlockCasingsTT, 11))
             .addElement('D', ofBlock(sBlockCasingsTT, 12))
-            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_wormhole::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('F', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('E', ofHatchAdderOptional(GT_MetaTileEntity_EM_wormhole::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('G', ofHatchAdderOptional(GT_MetaTileEntity_EM_wormhole::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .build();
     //endregion
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
index 3df25033ca..fec070407b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
@@ -50,13 +50,13 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
             translateToLocal("gt.blockmachines.multimachine.tm.microwave.hint.1"),//Also acts like a hopper so give it an Output Bus
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_TM_microwave> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_TM_microwave>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_TM_microwave> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_TM_microwave>builder()
             .addShape("main", transpose(new String[][]{
-                    {"AAAAA","A---A","A---A","A---A","AAAAA"},
-                    {"AAAAA","A---A","A---A","A---A","AAAAA"},
-                    {"AA~AA","A---A","A---A","A---A","AAAAA"},
-                    {"ABBBA","BAAAB","BAAAB","BAAAB","ABBBA"}
+                    {"AAAAA", "A---A", "A---A", "A---A", "AAAAA"},
+                    {"AAAAA", "A---A", "A---A", "A---A", "AAAAA"},
+                    {"AA~AA", "A---A", "A---A", "A---A", "AAAAA"},
+                    {"ABBBA", "BAAAB", "BAAAB", "BAAAB", "ABBBA"}
             }))
             .addElement('A', ofBlock(sBlockCasings4, 1))
             .addElement('B', ofHatchAdderOptional(GT_MetaTileEntity_TM_microwave::addClassicToMachineList, 49, 1, sBlockCasings4, 1))
@@ -69,11 +69,11 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
     private static final INameFunction<GT_MetaTileEntity_TM_microwave> POWER_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.0");//Power setting
     private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgi.1");//Timer setting
 
-    private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_VALUE_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.0");//Timer value
-    private static final INameFunction<GT_MetaTileEntity_TM_microwave> TIMER_REMAINING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.1");//Timer remaining
-    private static final IStatusFunction<GT_MetaTileEntity_TM_microwave> POWER_STATUS =
+    private static final INameFunction<GT_MetaTileEntity_TM_microwave>   TIMER_VALUE_NAME     = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.0");//Timer value
+    private static final INameFunction<GT_MetaTileEntity_TM_microwave>   TIMER_REMAINING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.microwave.cfgo.1");//Timer remaining
+    private static final IStatusFunction<GT_MetaTileEntity_TM_microwave> POWER_STATUS         =
             (base, p) -> LedStatus.fromLimitsInclusiveOuterBoundary(p.get(), 300, 1000, 1000, Double.POSITIVE_INFINITY);
-    private static final IStatusFunction<GT_MetaTileEntity_TM_microwave> TIMER_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_microwave> TIMER_STATUS         = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (int) value;
@@ -98,7 +98,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        return  structureCheck_EM("main", 2, 2, 0);
+        return structureCheck_EM("main", 2, 2, 0);
     }
 
     @Override
@@ -125,16 +125,16 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
         }
         timerValue.set(timerValue.get() + 1);
         remainingTime.set(timerSetting.get() - timerValue.get());
-        IGregTechTileEntity mte = getBaseMetaTileEntity();
-        Vec3Impl xyzOffsets = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -1, 2));
-        double xPos = mte.getXCoord() + 0.5f + xyzOffsets.get0();
-        double yPos = mte.getYCoord() + 0.5f + xyzOffsets.get1();
-        double zPos = mte.getZCoord() + 0.5f + xyzOffsets.get2();
+        IGregTechTileEntity mte        = getBaseMetaTileEntity();
+        Vec3Impl            xyzOffsets = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -1, 2));
+        double              xPos       = mte.getXCoord() + 0.5f + xyzOffsets.get0();
+        double              yPos       = mte.getYCoord() + 0.5f + xyzOffsets.get1();
+        double              zPos       = mte.getZCoord() + 0.5f + xyzOffsets.get2();
         AxisAlignedBB aabb = getBoundingBox(-2, -2, -2, 2, 2, 2)
                 .offset(xPos, yPos, zPos);
         xyzOffsets = getExtendedFacing().getWorldOffset(new Vec3Impl(0, -4, 0));
         Vec3Impl xyzExpansion = getExtendedFacing().getWorldOffset(new Vec3Impl(1, 0, 1)).abs();
-        int power = (int) powerSetting.get();
+        int      power        = (int) powerSetting.get();
         int damagingFactor =
                 Math.min(power >> 6, 8) +
                         Math.min(power >> 8, 24) +
@@ -142,7 +142,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
                         (power >> 18);
 
         ArrayList<ItemStack> itemsToOutput = new ArrayList<>();
-        HashSet<Entity> tickedStuff = new HashSet<>();
+        HashSet<Entity>      tickedStuff   = new HashSet<>();
 
         boolean inside = true;
         do {
@@ -170,7 +170,7 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
                 }
             }
             aabb.offset(xyzOffsets.get0(), xyzOffsets.get1(), xyzOffsets.get2());
-            aabb = aabb.expand(xyzExpansion.get0()*1.5, xyzExpansion.get1()*1.5, xyzExpansion.get2()*1.5);
+            aabb = aabb.expand(xyzExpansion.get0() * 1.5, xyzExpansion.get1() * 1.5, xyzExpansion.get2() * 1.5);
             inside = false;
             damagingFactor >>= 1;
         } while (damagingFactor > 0);
@@ -195,12 +195,12 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock
 
     @Override
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity,true, false, true);
+        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, true, false, true);
     }
 
     @Override
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png",true, false, true);//todo texture
+        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png", true, false, true);//todo texture
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index c4d1de75fe..f2081547c3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -53,38 +53,38 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable, ITeslaConnectable {
     //Interface fields
     private final Multimap<Integer, ITeslaConnectableSimple> teslaNodeMap = MultimapBuilder.treeKeys().linkedListValues().build();
-    private final HashSet<ThaumSpark> sparkList = new HashSet<>();
-    private int sparkCount = 10;
+    private final HashSet<ThaumSpark>                        sparkList    = new HashSet<>();
+    private       int                                        sparkCount   = 10;
 
     //region variables
-    private static final int transferRadiusTowerFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_TOWER;//Default is 32
-    private static final int transferRadiusTransceiverFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_TRANSCEIVER;//Default is 16
-    private static final int transferRadiusCoverUltimateFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_COVER;//Default is 16
-    private static final int plasmaRangeMultiT1 = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1;//Default is 2
-    private static final int plasmaRangeMultiT2 = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2;//Default is 4
-    private static final int heliumUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM;//Default is 100
-    private static final int nitrogenUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN;//Default is 50
-    private static final int radonUse = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON;//Default is 50
+    private static final int     transferRadiusTowerFromConfig         = TecTech.configTecTech.TESLA_MULTI_RANGE_TOWER;//Default is 32
+    private static final int     transferRadiusTransceiverFromConfig   = TecTech.configTecTech.TESLA_MULTI_RANGE_TRANSCEIVER;//Default is 16
+    private static final int     transferRadiusCoverUltimateFromConfig = TecTech.configTecTech.TESLA_MULTI_RANGE_COVER;//Default is 16
+    private static final int     plasmaRangeMultiT1                    = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T1;//Default is 2
+    private static final int     plasmaRangeMultiT2                    = TecTech.configTecTech.TESLA_MULTI_RANGE_COEFFICIENT_PLASMA_T2;//Default is 4
+    private static final int     heliumUse                             = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_HELIUM;//Default is 100
+    private static final int     nitrogenUse                           = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T1_NITROGEN;//Default is 50
+    private static final int     radonUse                              = TecTech.configTecTech.TESLA_MULTI_PLASMA_PER_SECOND_T2_RADON;//Default is 50
     //Default is {1, 1, 1}
-    private static final int[] plasmaTierLoss = new int[]{TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T0,
+    private static final int[]   plasmaTierLoss                        = new int[]{TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T0,
             TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T1, TecTech.configTecTech.TESLA_MULTI_LOSS_PER_BLOCK_T2};
-    private static final float overDriveLoss = TecTech.configTecTech.TESLA_MULTI_LOSS_FACTOR_OVERDRIVE;//Default is 0.25F;
-    private static final boolean doFluidOutput = TecTech.configTecTech.TESLA_MULTI_GAS_OUTPUT; //Default is false
+    private static final float   overDriveLoss                         = TecTech.configTecTech.TESLA_MULTI_LOSS_FACTOR_OVERDRIVE;//Default is 0.25F;
+    private static final boolean doFluidOutput                         = TecTech.configTecTech.TESLA_MULTI_GAS_OUTPUT; //Default is false
 
     //Face icons
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
-    private int mTier = 0; //Determines max voltage (LV to ZPM)
+    private int mTier      = 0; //Determines max voltage (LV to ZPM)
     private int plasmaTier = 0; //0 is None, 1 is Helium or Nitrogen, 2 is Radon (Does not match actual plasma tiers)
 
     private FluidStack[] mOutputFluidsQueue; //Used to buffer the fluid outputs, so the tesla takes a second to 'cool' any plasma it would output as a gas
 
     private final ArrayList<GT_MetaTileEntity_Hatch_Capacitor> eCapacitorHatches = new ArrayList<>(); //Capacitor hatches which determine the max voltage tier and count of amps
 
-    private long energyCapacity = 0; //Total energy storage limited by capacitors
+    private long energyCapacity   = 0; //Total energy storage limited by capacitors
     private long outputVoltageMax = 0; //Tesla voltage output limited by capacitors
-    private int vTier = -1; //Tesla voltage tier limited by capacitors
+    private int  vTier            = -1; //Tesla voltage tier limited by capacitors
     private long outputCurrentMax = 0; //Tesla current output limited by capacitors
 
     //outputVoltage and current after settings
@@ -92,10 +92,10 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     private long outputCurrent;
 
     //Prevents unnecessary offset calculation, saving on lag
-    private byte oldRotation = -1;
-    private byte oldOrientation = -1;
+    private byte     oldRotation    = -1;
+    private byte     oldOrientation = -1;
     //Location of the center of the sphere on top of the tower, used as the Thaumcraft lightning and origin
-    public Vec3Impl posTop = Vec3Impl.NULL_VECTOR;
+    public  Vec3Impl posTop         = Vec3Impl.NULL_VECTOR;
     //endregion
 
     //region structure
@@ -104,26 +104,26 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
             translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.0"),//1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_TM_teslaCoil>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_TM_teslaCoil>builder()
             .addShape("main", transpose(new String[][]{
-                    {"       ","       ","  BBB  ","  BBB  ","  BBB  ","       ","       "},
-                    {"       ","  BBB  "," BBBBB "," BBBBB "," BBBBB ","  BBB  ","       "},
-                    {"       ","  BBB  "," BBBBB "," BBBBB "," BBBBB ","  BBB  ","       "},
-                    {"       ","  BBB  "," BBBBB "," BBBBB "," BBBBB ","  BBB  ","       "},
-                    {"       ","       ","  BBB  ","  BCB  ","  BBB  ","       ","       "},
-                    {"       ","       ","       ","   C   ","       ","       ","       "},
-                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
-                    {"       ","       ","       ","   C   ","       ","       ","       "},
-                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
-                    {"       ","       ","       ","   C   ","       ","       ","       "},
-                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
-                    {"       ","       ","       ","   C   ","       ","       ","       "},
-                    {"       ","  BBB  "," B F B "," BFCFB "," B F B ","  BBB  ","       "},
-                    {"       ","       ","       ","   C   ","       ","       ","       "},
-                    {"       ","       ","       ","   C   ","       ","       ","       "},
-                    {"       ","  DDD  "," D   D "," D C D "," D   D ","  DDD  ","       "},
-                    {" EE~EE ","EAAAAAE","EADDDAE","EADADAE","EADDDAE"," AAAAAE"," EEEEE "}
+                    {"       ", "       ", "  BBB  ", "  BBB  ", "  BBB  ", "       ", "       "},
+                    {"       ", "  BBB  ", " BBBBB ", " BBBBB ", " BBBBB ", "  BBB  ", "       "},
+                    {"       ", "  BBB  ", " BBBBB ", " BBBBB ", " BBBBB ", "  BBB  ", "       "},
+                    {"       ", "  BBB  ", " BBBBB ", " BBBBB ", " BBBBB ", "  BBB  ", "       "},
+                    {"       ", "       ", "  BBB  ", "  BCB  ", "  BBB  ", "       ", "       "},
+                    {"       ", "       ", "       ", "   C   ", "       ", "       ", "       "},
+                    {"       ", "  BBB  ", " B F B ", " BFCFB ", " B F B ", "  BBB  ", "       "},
+                    {"       ", "       ", "       ", "   C   ", "       ", "       ", "       "},
+                    {"       ", "  BBB  ", " B F B ", " BFCFB ", " B F B ", "  BBB  ", "       "},
+                    {"       ", "       ", "       ", "   C   ", "       ", "       ", "       "},
+                    {"       ", "  BBB  ", " B F B ", " BFCFB ", " B F B ", "  BBB  ", "       "},
+                    {"       ", "       ", "       ", "   C   ", "       ", "       ", "       "},
+                    {"       ", "  BBB  ", " B F B ", " BFCFB ", " B F B ", "  BBB  ", "       "},
+                    {"       ", "       ", "       ", "   C   ", "       ", "       ", "       "},
+                    {"       ", "       ", "       ", "   C   ", "       ", "       ", "       "},
+                    {"       ", "  DDD  ", " D   D ", " D C D ", " D   D ", "  DDD  ", "       "},
+                    {" EE~EE ", "EAAAAAE", "EADDDAE", "EADADAE", "EADDDAE", " AAAAAE", " EEEEE "}
             }))
             .addElement('A', ofBlock(sBlockCasingsBA0, 6))
             .addElement('B', ofBlock(sBlockCasingsBA0, 7))
@@ -143,28 +143,28 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     protected Parameters.Group.ParameterIn popogaSetting, histLowSetting, histHighSetting, transferRadiusTowerSetting, transferRadiusTransceiverSetting, transferRadiusCoverUltimateSetting, outputVoltageSetting, outputCurrentSetting, sortTimeMinSetting, overDriveSetting;
     protected Parameters.Group.ParameterOut popogaDisplay, transferRadiusTowerDisplay, transferRadiusTransceiverDisplay, transferRadiusCoverUltimateDisplay, outputVoltageDisplay, outputCurrentDisplay, energyCapacityDisplay, energyStoredDisplay, energyFractionDisplay, sortTimeDisplay;
 
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_LOW_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0");//Hysteresis low setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_HIGH_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1");//Hysteresis high setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2");//Tesla Towers transfer radius setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3");//Tesla Transceiver transfer radius setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_LOW_SETTING_NAME                 = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.0");//Hysteresis low setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_HIGH_SETTING_NAME                = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.1");//Hysteresis high setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_SETTING_NAME          = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.2");//Tesla Towers transfer radius setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_SETTING_NAME    = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.3");//Tesla Transceiver transfer radius setting
     private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.4");//Tesla Ultimate Cover transfer radius setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5");//Output voltage setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6");//Output current setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_MIN_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7");//Scan time Min setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OVERDRIVE_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8");//Overdrive setting
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> POPOGA_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9");//Unused
-
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0");//Tesla Towers transfer radius display
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1");//Tesla Transceiver transfer radius display
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_SETTING_NAME                 = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.5");//Output voltage setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_SETTING_NAME                 = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.6");//Output current setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_MIN_SETTING_NAME                  = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.7");//Scan time Min setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OVERDRIVE_SETTING_NAME                      = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.8");//Overdrive setting
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> POPOGA_NAME                                 = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgi.9");//Unused
+
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_DISPLAY_NAME          = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.0");//Tesla Towers transfer radius display
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_DISPLAY_NAME    = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.1");//Tesla Transceiver transfer radius display
     private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_COVER_ULTIMATE_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.2");//Tesla Ultimate Cover transfer radius display
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3");//Output voltage display
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4");//Output current display
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_CAPACITY_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5");//Energy Capacity display
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_STORED_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6");//Energy Stored display
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_FRACTION_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7");//Energy Fraction display
-    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_DISPLAY_NAME = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8");//Scan time display
-
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_LOW_STATUS = (base, p) -> {
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_DISPLAY_NAME                 = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.3");//Output voltage display
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_CURRENT_DISPLAY_NAME                 = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.4");//Output current display
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_CAPACITY_DISPLAY_NAME                = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.5");//Energy Capacity display
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_STORED_DISPLAY_NAME                  = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.6");//Energy Stored display
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_FRACTION_DISPLAY_NAME                = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.7");//Energy Fraction display
+    private static final INameFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_DISPLAY_NAME                      = (base, p) -> translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.cfgo.8");//Scan time display
+
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_LOW_STATUS                 = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) {
             return STATUS_WRONG;
@@ -173,14 +173,14 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if (value > base.histHighSetting.get()) return STATUS_TOO_HIGH;
         return STATUS_OK;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_HIGH_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> HYSTERESIS_HIGH_STATUS                = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         if (value <= base.histLowSetting.get()) return STATUS_TOO_LOW;
         if (value > 0.95) return STATUS_TOO_HIGH;
         return STATUS_OK;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TOWER_STATUS          = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (int) value;
@@ -189,7 +189,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if (value < transferRadiusTowerFromConfig) return STATUS_LOW;
         return STATUS_OK;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> TRANSFER_RADIUS_TRANSCEIVER_STATUS    = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (int) value;
@@ -207,7 +207,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if (value < transferRadiusCoverUltimateFromConfig) return STATUS_LOW;
         return STATUS_OK;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_OR_CURRENT_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> OUTPUT_VOLTAGE_OR_CURRENT_STATUS      = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (long) value;
@@ -215,7 +215,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if (value <= 0) return STATUS_TOO_LOW;
         return STATUS_OK;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_MIN_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_MIN_STATUS                  = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (int) value;
@@ -223,7 +223,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if (value == 100) return STATUS_OK;
         return STATUS_HIGH;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> OVERDRIVE_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> OVERDRIVE_STATUS                      = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (int) value;
@@ -231,20 +231,20 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         if (value == 0) return STATUS_LOW;
         return STATUS_HIGH;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> POPOGA_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> POPOGA_STATUS                         = (base, p) -> {
         if (base.getBaseMetaTileEntity().getWorld().isThundering()) {
             return STATUS_WTF;
         }
         return STATUS_NEUTRAL;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> SCAN_TIME_STATUS                      = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (int) value;
         if (value == 0) return STATUS_HIGH;
         return STATUS_LOW;
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> POWER_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> POWER_STATUS                          = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         value = (long) value;
@@ -254,7 +254,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
             return STATUS_LOW;
         }
     };
-    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_STATUS = (base, p) -> {
+    private static final IStatusFunction<GT_MetaTileEntity_TM_teslaCoil> ENERGY_STATUS                         = (base, p) -> {
         double value = p.get();
         if (Double.isNaN(value)) return STATUS_WRONG;
         if (base.energyFractionDisplay.get() > base.histHighSetting.get()) {
@@ -369,8 +369,8 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
                 oldOrientation = iGregTechTileEntity.getFrontFacing();
 
                 Vec3Impl posBMTE = new Vec3Impl(getBaseMetaTileEntity().getXCoord(),
-                                                getBaseMetaTileEntity().getYCoord(),
-                                                getBaseMetaTileEntity().getZCoord());
+                        getBaseMetaTileEntity().getYCoord(),
+                        getBaseMetaTileEntity().getZCoord());
 
                 //Calculate coordinates of the middle bottom
                 posTop = getExtendedFacing().getWorldOffset(new Vec3Impl(0, 0, 2)).add(posBMTE);
@@ -612,10 +612,10 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
         //TODO Encapsulate the spark sender
         sparkCount--;
-        if (sparkCount == 0){
+        if (sparkCount == 0) {
             IGregTechTileEntity mte = getBaseMetaTileEntity();
             sparkCount = 10;
-            if(!sparkList.isEmpty()){
+            if (!sparkList.isEmpty()) {
                 NetworkDispatcher.INSTANCE.sendToAllAround(new RendererMessage.RendererData(sparkList),
                         mte.getWorld().provider.dimensionId,
                         mte.getXCoord(),
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
index b7db310d12..6871be2a5f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
@@ -59,7 +59,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
 
     protected static final byte FUSE_MODE = 0, COLLIDE_MODE = 1;
     private static double MASS_TO_EU_INSTANT;
-    private static int STARTUP_COST, KEEPUP_COST;
+    private static int    STARTUP_COST, KEEPUP_COST;
 
     protected byte            eTier = 0;
     protected EMInstanceStack stack;
@@ -69,7 +69,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region collision handlers
-    public static final HashMap<Long, IColliderHandler> FUSE_HANDLERS = new HashMap<>();
+    public static final HashMap<Long, IColliderHandler>            FUSE_HANDLERS           = new HashMap<>();
     public static final HashMap<String, IPrimitiveColliderHandler> PRIMITIVE_FUSE_HANDLERS = new HashMap<>();
 
     static {
@@ -263,7 +263,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     //endregion
 
     //region parameters
-    protected Parameters.Group.ParameterIn mode;
+    protected            Parameters.Group.ParameterIn                   mode;
     private static final IStatusFunction<GT_MetaTileEntity_EM_collider> MODE_STATUS = (base_EM, p) -> {
         if (base_EM.isMaster()) {
             double mode = p.get();
@@ -278,7 +278,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         }
         return STATUS_OK;
     };
-    private static final INameFunction<GT_MetaTileEntity_EM_collider> MODE_NAME = (base_EM, p) -> {
+    private static final INameFunction<GT_MetaTileEntity_EM_collider>   MODE_NAME   = (base_EM, p) -> {
         if (base_EM.isMaster()) {
             double mode = p.get();
             if (mode == FUSE_MODE) {
@@ -303,23 +303,31 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             translateToLocal("gt.blockmachines.multimachine.em.collider.hint.4"),//General - Another Controller facing opposite direction
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_collider>builder()
-            .addShape("main", transpose(new String[][]{
-                    {"         A A A         ","        AAAAAAA        ","      BBBBIIIBBBB      ","     BAAAAAAAAAAAB     ","    BAAAA     AAAAB    ","   BAAA         AAAB   ","  BAAA           AAAB  ","  BAA             AAB  "," ABAA             AABA ","AABA               ABAA"," AIA               AIA ","AAIA               AIAA"," AIA               AIA ","AABA               ABAA"," ABAA             AABA ","  BAA             AAB  ","  BAAA           AAAB  ","   BAAA         AAAB   ","    BAAAABJJJBAAAAB    ","     BAHHBBBBBHHAB     ","      BBBBGFGBBBB      "},
-                    {"         AAAAA         ","       AADDDDDAA       ","      CDDEEEEEDDC      ","     CDEEDDDDDEEDC     ","    CDEDD     DDEDC    ","   CDED         DEDC   ","  CDED           DEDC  "," ADED             DEDA "," ADED             DEDA ","ADED               DEDA","ADED               DEDA","ADED               DEDA","ADED               DEDA","ADED               DEDA"," ADED             DEDA "," ADED             DEDA ","  CDED           DEDC  ","   CDED         DEDC   ","    CDEDDBJ~JBDDEDC    ","     CDEEDDDDDEEDC     ","      CDDEEEEEDDC      "},
-                    {"         A A A         ","        AAAAAAA        ","      BBBBIIIBBBB      ","     BAAAAAAAAAAAB     ","    BAAAA     AAAAB    ","   BAAA         AAAB   ","  BAAA           AAAB  ","  BAA             AAB  "," ABAA             AABA ","AABA               ABAA"," AIA               AIA ","AAIA               AIAA"," AIA               AIA ","AABA               ABAA"," ABAA             AABA ","  BAA             AAB  ","  BAAA           AAAB  ","   BAAA         AAAB   ","    BAAAABJJJBAAAAB    ","     BAHHBBBBBHHAB     ","      BBBBGFGBBBB      "}
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_collider> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_collider>builder()
+            .addShape("tier1", transpose(new String[][]{
+                    {"         A A A         ", "        AAAAAAA        ", "      bbbbIIIbbbb      ", "     bAAAAAAAAAAAb     ", "    bAAAA     AAAAb    ", "   bAAA         AAAb   ", "  bAAA           AAAb  ", "  bAA             AAb  ", " AbAA             AAbA ", "AAbA               AbAA", " AIA               AIA ", "AAIA               AIAA", " AIA               AIA ", "AAbA               AbAA", " AbAA             AAbA ", "  bAA             AAb  ", "  bAAA           AAAb  ", "   bAAA         AAAb   ", "    bAAAAbJJJbAAAAb    ", "     bAHHbbbbbHHAb     ", "      bbbbGFGbbbb      "},
+                    {"         AAAAA         ", "       AADDDDDAA       ", "      cDDeeeeeDDc      ", "     cDeeDDDDDeeDc     ", "    cDeDD     DDeDc    ", "   cDeD         DeDc   ", "  cDeD           DeDc  ", " ADeD             DeDA ", " ADeD             DeDA ", "ADeD               DeDA", "ADeD               DeDA", "ADeD               DeDA", "ADeD               DeDA", "ADeD               DeDA", " ADeD             DeDA ", " ADeD             DeDA ", "  cDeD           DeDc  ", "   cDeD         DeDc   ", "    cDeDDbJ~JbDDeDc    ", "     cDeeDDDDDeeDc     ", "      cDDeeeeeDDc      "},
+                    {"         A A A         ", "        AAAAAAA        ", "      bbbbIIIbbbb      ", "     bAAAAAAAAAAAb     ", "    bAAAA     AAAAb    ", "   bAAA         AAAb   ", "  bAAA           AAAb  ", "  bAA             AAb  ", " AbAA             AAbA ", "AAbA               AbAA", " AIA               AIA ", "AAIA               AIAA", " AIA               AIA ", "AAbA               AbAA", " AbAA             AAbA ", "  bAA             AAb  ", "  bAAA           AAAb  ", "   bAAA         AAAb   ", "    bAAAAbJJJbAAAAb    ", "     bAHHbbbbbHHAb     ", "      bbbbGFGbbbb      "}
+            }))
+            .addShape("tier2", transpose(new String[][]{
+                    {"         A A A         ", "        AAAAAAA        ", "      BBBBIIIBBBB      ", "     BAAAAAAAAAAAB     ", "    BAAAA     AAAAB    ", "   BAAA         AAAB   ", "  BAAA           AAAB  ", "  BAA             AAB  ", " ABAA             AABA ", "AABA               ABAA", " AIA               AIA ", "AAIA               AIAA", " AIA               AIA ", "AABA               ABAA", " ABAA             AABA ", "  BAA             AAB  ", "  BAAA           AAAB  ", "   BAAA         AAAB   ", "    BAAAABJJJBAAAAB    ", "     BAHHBBBBBHHAB     ", "      BBBBGFGBBBB      "},
+                    {"         AAAAA         ", "       AADDDDDAA       ", "      CDDEEEEEDDC      ", "     CDEEDDDDDEEDC     ", "    CDEDD     DDEDC    ", "   CDED         DEDC   ", "  CDED           DEDC  ", " ADED             DEDA ", " ADED             DEDA ", "ADED               DEDA", "ADED               DEDA", "ADED               DEDA", "ADED               DEDA", "ADED               DEDA", " ADED             DEDA ", " ADED             DEDA ", "  CDED           DEDC  ", "   CDED         DEDC   ", "    CDEDDBJ~JBDDEDC    ", "     CDEEDDDDDEEDC     ", "      CDDEEEEEDDC      "},
+                    {"         A A A         ", "        AAAAAAA        ", "      BBBBIIIBBBB      ", "     BAAAAAAAAAAAB     ", "    BAAAA     AAAAB    ", "   BAAA         AAAB   ", "  BAAA           AAAB  ", "  BAA             AAB  ", " ABAA             AABA ", "AABA               ABAA", " AIA               AIA ", "AAIA               AIAA", " AIA               AIA ", "AABA               ABAA", " ABAA             AABA ", "  BAA             AAB  ", "  BAAA           AAAB  ", "   BAAA         AAAB   ", "    BAAAABJJJBAAAAB    ", "     BAHHBBBBBHHAB     ", "      BBBBGFGBBBB      "}
             }))
             .addElement('A', ofBlock(sBlockCasingsTT, 4))
-            .addElement('B', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1), error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 5)))
-            .addElement('C', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1), error(), ofBlock(sBlockCasingsTT, 4), ofBlock(sBlockCasingsTT, 6)))
+            .addElement('b', ofBlock(sBlockCasingsTT, 4))
+            .addElement('B', ofBlock(sBlockCasingsTT, 5))
+            .addElement('c', ofBlock(sBlockCasingsTT, 4))
+            .addElement('C', ofBlock(sBlockCasingsTT, 6))
             .addElement('D', ofBlock(sBlockCasingsTT, 7))
-            .addElement('E', defer(t -> (int) t.eTier, (t, item) -> 2 - (item.stackSize & 1), error(), ofBlock(sBlockCasingsTT, 8), ofBlock(sBlockCasingsTT, 9)))
-            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
-            .addElement('G', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList, textureOffset + 4, 4, sBlockCasingsTT, 4))
-            .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('e', ofBlock(sBlockCasingsTT, 8))
+            .addElement('E', ofBlock(sBlockCasingsTT, 9))
             .addElement('I', ofBlock(QuantumGlassBlock.INSTANCE, 0))
             .addElement('J', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
+            .addElement('H', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalInputToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
+            .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalOutputToMachineList, textureOffset + 4, 3, sBlockCasingsTT, 4))
+            .addElement('G', ofHatchAdderOptional(GT_MetaTileEntity_EM_collider::addElementalMufflerToMachineList, textureOffset + 4, 4, sBlockCasingsTT, 4))
             .build();
 
     @Override
@@ -338,7 +346,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     public static void setValues(int heliumPlasmaValue) {
-        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07* EM_COUNT_PER_MATERIAL_AMOUNT);//mass diff
+        double MASS_TO_EU_PARTIAL = heliumPlasmaValue / (1.75893000478707E07 * EM_COUNT_PER_MATERIAL_AMOUNT);//mass diff
         MASS_TO_EU_INSTANT = MASS_TO_EU_PARTIAL * 20;
         STARTUP_COST = -heliumPlasmaValue * 10000;
         KEEPUP_COST = -heliumPlasmaValue;
@@ -350,7 +358,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                     partner.stack.getDefinition().fusionMakesEnergy(partner.stack.getEnergy());
 
             EMInstanceStack stack2  = partner.stack;
-            double          preMass = add(stack2.getMass(),stack.getMass());
+            double          preMass = add(stack2.getMass(), stack.getMass());
             //System.out.println("preMass = " + preMass);
 
             EMInstanceStackMap map = new EMInstanceStackMap();
@@ -414,10 +422,10 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     protected GT_MetaTileEntity_EM_collider getPartner() {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        IGregTechTileEntity iGregTechTileEntity    = getBaseMetaTileEntity();
+        int                 xDir                   = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int                 yDir                   = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int                 zDir                   = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
         IGregTechTileEntity gregTechBaseTileEntity = iGregTechTileEntity.getIGregTechTileEntityOffset(xDir, yDir, zDir);
         if (gregTechBaseTileEntity != null) {
             IMetaTileEntity gregTechMetaTileEntity = gregTechBaseTileEntity.getMetaTileEntity();
@@ -477,7 +485,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
             eTier = 0;
             return false;
         }
-        if (structureCheck_EM("main", 11, 1, 18)) {
+        if (structureCheck_EM("tier"+eTier, 11, 1, 18)) {
             return true;
         }
         eTier = 0;
@@ -628,7 +636,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
         eTier = aNBT.getByte("eTier");//collider tier
         started = aNBT.getBoolean("eStarted");
         if (aNBT.hasKey("eStack")) {
-            stack = EMInstanceStack.fromNBT(TecTech.definitionsRegistry,aNBT.getCompoundTag("eStack"));
+            stack = EMInstanceStack.fromNBT(TecTech.definitionsRegistry, aNBT.getCompoundTag("eStack"));
         }
         plasmaEnergy = aNBT.getLong("ePlasmaEnergy");
     }
@@ -663,11 +671,11 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
     }
 
     @Override
-    public void construct(ItemStack stackSize, boolean hintsOnly) {
+    public void construct(ItemStack trigger, boolean hintsOnly) {
         IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
+        int                 xDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX * 4;
+        int                 yDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY * 4;
+        int                 zDir                = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ * 4;
         if (hintsOnly) {
             StructureLibAPI.hintParticle(iGregTechTileEntity.getWorld(),
                     iGregTechTileEntity.getXCoord() + xDir,
@@ -675,7 +683,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                     iGregTechTileEntity.getZCoord() + zDir,
                     StructureLibAPI.getBlockHint(), 12);
         }
-        structureBuild_EM("main", 11, 1, 18, stackSize, hintsOnly);
+        structureBuild_EM("tier"+((trigger.stackSize%2)+1), 11, 1, 18, trigger, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index 3b0e8ba91d..9540a84fcf 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -36,7 +36,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
     //region variables
     public static final String machine = "EM Machinery";
 
-    private ItemStack loadedMachine;
+    private ItemStack  loadedMachine;
     private IBehaviour currentBehaviour;
     //endregion
 
@@ -47,27 +47,27 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             translateToLocal("gt.blockmachines.multimachine.em.processing.hint.1"),//2 - Elemental Hatches or Molecular Casing
     };
 
-    private static final IStructureDefinition<GT_MetaTileEntity_EM_machine> STRUCTURE_DEFINITION =
-            IStructureDefinition.<GT_MetaTileEntity_EM_machine>builder()
+    private static final IStructureDefinition<GT_MetaTileEntity_EM_machine> STRUCTURE_DEFINITION = IStructureDefinition
+            .<GT_MetaTileEntity_EM_machine>builder()
             .addShape("main", new String[][]{
-                    {"  A  "," AAA "," EBE "," ECE "," EBE "," AAA ","  A  "},
-                    {" DDD ","AAAAA","E---E","E---E","E---E","AAAAA"," FFF "},
-                    {"AD-DA","AA~AA","B---B","C---C","B---B","AA-AA","AFFFA"},
-                    {" DDD ","AAAAA","E---E","E---E","E---E","AAAAA"," FFF "},
-                    {"  A  "," AAA "," EBE "," ECE "," EBE "," AAA ","  A  "}
+                    {"  A  ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", "  A  "},
+                    {" DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF "},
+                    {"AD-DA", "AA~AA", "B---B", "C---C", "B---B", "AA-AA", "AFFFA"},
+                    {" DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF "},
+                    {"  A  ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", "  A  "}
             })
             .addElement('A', ofBlock(sBlockCasingsTT, 4))
             .addElement('B', ofBlock(sBlockCasingsTT, 5))
             .addElement('C', ofBlock(sBlockCasingsTT, 6))
-            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_machine::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('E', ofBlock(QuantumGlassBlock.INSTANCE, 0))
+            .addElement('D', ofHatchAdderOptional(GT_MetaTileEntity_EM_machine::addClassicToMachineList, textureOffset, 1, sBlockCasingsTT, 0))
             .addElement('F', ofHatchAdderOptional(GT_MetaTileEntity_EM_machine::addElementalToMachineList, textureOffset + 4, 2, sBlockCasingsTT, 4))
             .build();
     //endregion
 
     //region parameters
-    protected Parameters.Group.ParameterIn[] inputMux;
-    protected Parameters.Group.ParameterIn[] outputMux;
+    protected            Parameters.Group.ParameterIn[]                inputMux;
+    protected            Parameters.Group.ParameterIn[]                outputMux;
     private static final IStatusFunction<GT_MetaTileEntity_EM_machine> SRC_STATUS =
             (base, p) -> {
                 double v = p.get();
@@ -91,7 +91,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
                 }
                 return STATUS_NEUTRAL;
             };
-    private static final INameFunction<GT_MetaTileEntity_EM_machine> ROUTE_NAME =
+    private static final INameFunction<GT_MetaTileEntity_EM_machine>   ROUTE_NAME =
             (base, p) -> (p.parameterId() == 0 ? translateToLocal("tt.keyword.Source") + " " : translateToLocal("tt.keyword.Destination") + " ") + p.hatchId();
     //endregion
 
@@ -169,9 +169,9 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
     private void quantumStuff(boolean shouldIExist) {
         IGregTechTileEntity base = getBaseMetaTileEntity();
         if (base != null && base.getWorld() != null) {
-            int xDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 2 + base.getXCoord();
-            int yDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 2 + base.getYCoord();
-            int zDir = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 2 + base.getZCoord();
+            int   xDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetX * 2 + base.getXCoord();
+            int   yDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetY * 2 + base.getYCoord();
+            int   zDir  = ForgeDirection.getOrientation(base.getBackFacing()).offsetZ * 2 + base.getZCoord();
             Block block = base.getWorld().getBlock(xDir, yDir, zDir);
             if (shouldIExist) {
                 if (block != null && block.getMaterial() == Material.air) {
-- 
cgit 


From 1cee4ac982c2d3b7b29789456a4cd72f10b8c320 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Mon, 31 Jan 2022 23:54:19 +0100
Subject: Fix structures

---
 .../GT_MetaTileEntity_EM_essentiaDequantizer.java   | 21 ---------------------
 .../GT_MetaTileEntity_EM_essentiaQuantizer.java     | 21 ---------------------
 .../technus/tectech/font/TecTechFontRender.java     |  2 +-
 .../multi/GT_MetaTileEntity_EM_junction.java        | 10 +++++-----
 .../multi/GT_MetaTileEntity_EM_scanner.java         |  2 +-
 .../multi/GT_MetaTileEntity_TM_teslaCoil.java       |  1 +
 .../em_collider/GT_MetaTileEntity_EM_collider.java  |  2 +-
 .../em_machine/GT_MetaTileEntity_EM_machine.java    |  7 ++++---
 8 files changed, 13 insertions(+), 53 deletions(-)

diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
index 3278aa812b..e91dd2c4af 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java
@@ -13,13 +13,11 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.util.ForgeDirection;
 import thaumcraft.api.aspects.Aspect;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
@@ -157,25 +155,6 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ;
-        if (hintsOnly) {
-            StructureLibAPI.hintParticle(iGregTechTileEntity.getWorld(),
-                    iGregTechTileEntity.getXCoord() + xDir,
-                    iGregTechTileEntity.getYCoord() + yDir,
-                    iGregTechTileEntity.getZCoord() + zDir,
-                    StructureLibAPI.getBlockHint(), 12);
-        } else {
-            if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir).getMaterial() == Material.air) {
-                iGregTechTileEntity.getWorld().setBlock(
-                        iGregTechTileEntity.getXCoord() + xDir,
-                        iGregTechTileEntity.getYCoord() + yDir,
-                        iGregTechTileEntity.getZCoord() + zDir,
-                        StructureLibAPI.getBlockHint(), 12, 2);
-            }
-        }
         structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
index debbcd2ae0..befc9ac77e 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java
@@ -15,11 +15,9 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import net.minecraft.block.material.Material;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.util.ForgeDirection;
 
 import static com.github.technus.tectech.compatibility.thaumcraft.thing.metaTileEntity.multi.EssentiaCompat.essentiaContainerCompat;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
@@ -131,25 +129,6 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu
 
     @Override
     public void construct(ItemStack stackSize, boolean hintsOnly) {
-        IGregTechTileEntity iGregTechTileEntity = getBaseMetaTileEntity();
-        int xDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetX;
-        int yDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetY;
-        int zDir = ForgeDirection.getOrientation(iGregTechTileEntity.getBackFacing()).offsetZ;
-        if (hintsOnly) {
-            StructureLibAPI.hintParticle(iGregTechTileEntity.getWorld(),
-                    iGregTechTileEntity.getXCoord() + xDir,
-                    iGregTechTileEntity.getYCoord() + yDir,
-                    iGregTechTileEntity.getZCoord() + zDir,
-                    StructureLibAPI.getBlockHint(), 12);
-        } else {
-            if (iGregTechTileEntity.getBlockOffset(xDir, 0, zDir).getMaterial() == Material.air) {
-                iGregTechTileEntity.getWorld().setBlock(
-                        iGregTechTileEntity.getXCoord() + xDir,
-                        iGregTechTileEntity.getYCoord() + yDir,
-                        iGregTechTileEntity.getZCoord() + zDir,
-                        StructureLibAPI.getBlockHint(), 12, 2);
-            }
-        }
         structureBuild_EM("main", 1, 1, 0, stackSize, hintsOnly);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
index ffbef07158..826ed3af5d 100644
--- a/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
+++ b/src/main/java/com/github/technus/tectech/font/TecTechFontRender.java
@@ -165,7 +165,7 @@ public class TecTechFontRender extends FontRenderer {
     }
 
     private float renderCharAtPos(int p_78278_1_, char p_78278_2_, boolean p_78278_3_) {
-        return p_78278_2_ == ' ' ? 4.0F : ("ÀÁÂÈÊËÍÓÔÕÚßãõğİıŒœŞşŴŵžȇ\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜø£Ø׃áíóúñѪº¿®¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αβΓπΣσμτΦΘΩδ∞∅∈∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■\u0000".indexOf(p_78278_2_) != -1 && !this.unicodeFlag ? this.renderDefaultChar(p_78278_1_, p_78278_3_) : this.renderUnicodeChar(p_78278_2_, p_78278_3_));
+        return p_78278_2_ == ' ' ? 4.0F : ("\u00C0\u00C1\u00C2\u00C8\u00CA\u00CB\u00CD\u00D3\u00D4\u00D5\u00DA\u00DF\u00E3\u00F5\u011F\u0130\u0131\u0152\u0153\u015E\u015F\u0174\u0175\u017E\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u0000\u00C7\u00FC\u00E9\u00E2\u00E4\u00E0\u00E5\u00E7\u00EA\u00EB\u00E8\u00EF\u00EE\u00EC\u00C4\u00C5\u00C9\u00E6\u00C6\u00F4\u00F6\u00F2\u00FB\u00F9\u00FF\u00D6\u00DC\u00F8\u00A3\u00D8\u00D7\u0192\u00E1\u00ED\u00F3\u00FA\u00F1\u00D1\u00AA\u00BA\u00BF\u00AE\u00AC\u00BD\u00BC\u00A1\u00AB\u00BB\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255D\u255C\u255B\u2510\u2514\u2534\u252C\u251C\u2500\u253C\u255E\u255F\u255A\u2554\u2569\u2566\u2560\u2550\u256C\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256B\u256A\u2518\u250C\u2588\u2584\u258C\u2590\u2580\u03B1\u03B2\u0393\u03C0\u03A3\u03C3\u03BC\u03C4\u03A6\u0398\u03A9\u03B4\u221E\u2205\u2208\u2229\u2261\u00B1\u2265\u2264\u2320\u2321\u00F7\u2248\u00B0\u2219\u00B7\u221A\u207F\u00B2\u25A0\u0000".indexOf(p_78278_2_) != -1 && !this.unicodeFlag ? this.renderDefaultChar(p_78278_1_, p_78278_3_) : this.renderUnicodeChar(p_78278_2_, p_78278_3_));
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
index 62ecd507c2..23e7267388 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_junction.java
@@ -44,11 +44,11 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
                     {"DDD", "DDD", "DDD"}
             })
             .addShape("mainBig", new String[][]{
-                    {"     ", " CCC ", " C~C ", " CCC ", "     "},
-                    {" DDD ", "DAAAD", "DABAD", "DAAAD", " DDD "},
-                    {"DDDDD", "DAAAD", "DAAAD", "DAAAD", "DDDDD"},
+                    {"  A  ", " CCC ", "AC~CA", " CCC ", "  A  "},
                     {" DDD ", "DAAAD", "DAAAD", "DAAAD", " DDD "},
-                    {" DDD ", "DDDDD", "DDDDD", "DDDDD", " DDD "}
+                    {"ADDDA", "DAAAD", "DABAD", "DAAAD", "ADDDA"},
+                    {" DDD ", "DAAAD", "DAAAD", "DAAAD", " DDD "},
+                    {"  A  ", "DDDDD", "ADDDA", "DDDDD", "  A  "}
             })
             .addElement('A', ofBlock(sBlockCasingsTT, 4))
             .addElement('B', ofBlock(sBlockCasingsTT, 5))
@@ -102,7 +102,7 @@ public class GT_MetaTileEntity_EM_junction extends GT_MetaTileEntity_MultiblockB
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
-        int meta = iGregTechTileEntity.getMetaIDAtSide(GT_Utility.getOppositeSide(iGregTechTileEntity.getFrontFacing()));
+        int meta = iGregTechTileEntity.getMetaIDAtSideAndDistance(GT_Utility.getOppositeSide(iGregTechTileEntity.getFrontFacing()),2);
         if (meta == 4) {
             return structureCheck_EM("main", 1, 1, 0);
         } else if (meta == 5) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 8d4f86c164..8583f03193 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -85,7 +85,7 @@ public class GT_MetaTileEntity_EM_scanner extends GT_MetaTileEntity_MultiblockBa
             .addShape("main", transpose(new String[][]{
                     {"CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE"},
                     {"CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE"},
-                    {"CA~AC", "BBBBB", "DDDDD", "D---D", "D---D", "D---D", "DDGDD", "EBFBE"},
+                    {"CA~AC", "BBBBB", "DDDDD", "D---D", "D- -D", "D---D", "DDGDD", "EBFBE"},
                     {"CAAAC", "BBBBB", "BDDDB", "D---D", "D---D", "D---D", "BDDDB", "EBBBE"},
                     {"CCCCC", "BBBBB", "BBDBB", "BDDDB", "BDDDB", "BDDDB", "BBDBB", "EEEEE"}
             }))
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index f2081547c3..8d910d9431 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -102,6 +102,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     private static final String[] description = new String[]{
             EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
             translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.0"),//1 - Classic Hatches, Capacitor Hatches or Tesla Base Casing
+            translateToLocal("gt.blockmachines.multimachine.tm.teslaCoil.hint.1"),//2 - ""Titanium frames""
     };
 
     private static final IStructureDefinition<GT_MetaTileEntity_TM_teslaCoil> STRUCTURE_DEFINITION = IStructureDefinition
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
index 6871be2a5f..a2a9eab3a1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_collider/GT_MetaTileEntity_EM_collider.java
@@ -683,7 +683,7 @@ public class GT_MetaTileEntity_EM_collider extends GT_MetaTileEntity_MultiblockB
                     iGregTechTileEntity.getZCoord() + zDir,
                     StructureLibAPI.getBlockHint(), 12);
         }
-        structureBuild_EM("tier"+((trigger.stackSize%2)+1), 11, 1, 18, trigger, hintsOnly);
+        structureBuild_EM("tier"+(((trigger.stackSize-1)%2)+1), 11, 1, 18, trigger, hintsOnly);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index 9540a84fcf..2c4217aaba 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -26,6 +26,7 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static gregtech.api.util.GT_StructureUtility.ofHatchAdderOptional;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -49,13 +50,13 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
 
     private static final IStructureDefinition<GT_MetaTileEntity_EM_machine> STRUCTURE_DEFINITION = IStructureDefinition
             .<GT_MetaTileEntity_EM_machine>builder()
-            .addShape("main", new String[][]{
+            .addShape("main", transpose(new String[][]{
                     {"  A  ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", "  A  "},
                     {" DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF "},
-                    {"AD-DA", "AA~AA", "B---B", "C---C", "B---B", "AA-AA", "AFFFA"},
+                    {"AD-DA", "AA~AA", "B---B", "C- -C", "B---B", "AA-AA", "AFFFA"},
                     {" DDD ", "AAAAA", "E---E", "E---E", "E---E", "AAAAA", " FFF "},
                     {"  A  ", " AAA ", " EBE ", " ECE ", " EBE ", " AAA ", "  A  "}
-            })
+            }))
             .addElement('A', ofBlock(sBlockCasingsTT, 4))
             .addElement('B', ofBlock(sBlockCasingsTT, 5))
             .addElement('C', ofBlock(sBlockCasingsTT, 6))
-- 
cgit 


From e84cd1bf16a1324825c987c9d10be1322e5c349a Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 1 Feb 2022 20:37:21 +0100
Subject: Make the gaem boot with all the nice stuff

---
 dependencies.gradle                                |  16 ++++++++++------
 dependencies/AdvancedSolarPanel_1.7.10_Edition.jar | Bin 0 -> 305650 bytes
 repositories.gradle                                |   5 ++++-
 3 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 dependencies/AdvancedSolarPanel_1.7.10_Edition.jar

diff --git a/dependencies.gradle b/dependencies.gradle
index dca1d2612f..74c58e52c3 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -19,25 +19,29 @@ dependencies {
         transitive = false
     }*/
 
-    compileOnly("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") {
+    compile("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") {
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") {
         transitive = false
     }
 
-    compileOnly("dan200.computercraft:ComputerCraft:1.75") {
+    compile("dan200.computercraft:ComputerCraft:1.75") {
         transitive = false
     }
-    compileOnly("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") {
+    compile("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") {
         transitive = false
     }
-    compileOnly("curse.maven:cofh-core-69162:2388751") {
+    compile("curse.maven:cofh-core-69162:2388751") {
         transitive = false
     }
-    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
+    compile("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
+        transitive = false
+    }
+    compile("com.azanor.baubles:Baubles:1.0.1.10:deobf") {
         transitive = false
     }
 
-    compileOnly files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
+    compile files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
+    compile files("dependencies/AdvancedSolarPanel_1.7.10_Edition.jar")
 }
diff --git a/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar b/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar
new file mode 100644
index 0000000000..dfd00eb958
Binary files /dev/null and b/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar differ
diff --git a/repositories.gradle b/repositories.gradle
index 130197c8aa..61d3952270 100644
--- a/repositories.gradle
+++ b/repositories.gradle
@@ -18,9 +18,12 @@ repositories {
         }
     }
     maven {
-        url "https://cursemaven.com"
+        url = "https://cursemaven.com"
     }
     maven {
         url = "https://jitpack.io"
     }
+    maven {
+        url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public"
+    }
 }
-- 
cgit 


From 24f4cac5ea02b85501f976caaad898e86cce5a4f Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Tue, 1 Feb 2022 22:19:59 +0100
Subject: Sort things out in the load order

---
 dependencies.gradle                                |   1 +
 .../worldedit-forge-mc1.7.10-6.1.1-dist.jar        | Bin 0 -> 1461467 bytes
 .../java/com/github/technus/tectech/TecTech.java   |  46 +++++++++++----------
 3 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar

diff --git a/dependencies.gradle b/dependencies.gradle
index 74c58e52c3..ed933b256e 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -44,4 +44,5 @@ dependencies {
 
     compile files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
     compile files("dependencies/AdvancedSolarPanel_1.7.10_Edition.jar")
+    compile files("dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar")
 }
diff --git a/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar b/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar
new file mode 100644
index 0000000000..0361359748
Binary files /dev/null and b/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar differ
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 03701668ef..1248437e30 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -35,8 +35,12 @@ import java.util.Iterator;
 
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 
-@Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);"
-        + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;" + "after:dreamcraft;" + "required-after:structurelib;")
+@Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION,
+        dependencies = "required-after:Forge@[10.13.4.1614,);" +
+                "required-after:YAMCore@[0.5.70,);" + "required-after:structurelib;" +
+                "after:ComputerCraft;" + "after:OpenComputers;" +
+                "required-after:gregtech;" + "after:dreamcraft;" +
+                "after:appliedenergistics2;" + "after:CoFHCore;" + "after:Thaumcraft;")
 public class TecTech {
     @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE)
     public static CommonProxy proxy;
@@ -44,27 +48,27 @@ public class TecTech {
     @Mod.Instance(Reference.MODID)
     public static TecTech instance;
 
-    public static final XSTR RANDOM = XSTR.XSTR_INSTANCE;
+    public static final XSTR               RANDOM = XSTR.XSTR_INSTANCE;
     public static final LogHelper          LOGGER = new LogHelper(Reference.MODID);
-    public static CreativeTabTecTech creativeTabTecTech;
-    public static CreativeTabEM      creativeTabEM;
+    public static       CreativeTabTecTech creativeTabTecTech;
+    public static       CreativeTabEM      creativeTabEM;
 
     private static IngameErrorLog moduleAdminErrorLogs;
-    public static TecTechConfig configTecTech;
+    public static  TecTechConfig  configTecTech;
 
-    public static ChunkDataHandler chunkDataHandler;
-    public static AnomalyHandler anomalyHandler;
+    public static ChunkDataHandler  chunkDataHandler;
+    public static AnomalyHandler    anomalyHandler;
     public static PlayerPersistence playerPersistence;
 
-    public static final EMDefinitionsRegistry    definitionsRegistry =new EMDefinitionsRegistry();
-    public static final EMTransformationRegistry transformationInfo  =new EMTransformationRegistry();
+    public static final EMDefinitionsRegistry    definitionsRegistry = new EMDefinitionsRegistry();
+    public static final EMTransformationRegistry transformationInfo  = new EMTransformationRegistry();
 
     /**
      * For Loader.isModLoaded checks during the runtime
      */
     public static boolean hasCOFH = false;
 
-    public static final byte tectechTexturePage1=8;
+    public static final byte tectechTexturePage1 = 8;
 
     public static void AddLoginError(String pMessage) {
         if (moduleAdminErrorLogs != null) {
@@ -93,11 +97,11 @@ public class TecTech {
             moduleAdminErrorLogs = new IngameErrorLog();
         }
 
-        playerPersistence=new PlayerPersistence("tec");
+        playerPersistence = new PlayerPersistence("tec");
         FMLCommonHandler.instance().bus().register(playerPersistence);
         MinecraftForge.EVENT_BUS.register(playerPersistence);
 
-        chunkDataHandler=new  ChunkDataHandler();
+        chunkDataHandler = new ChunkDataHandler();
         FMLCommonHandler.instance().bus().register(chunkDataHandler);
         MinecraftForge.EVENT_BUS.register(chunkDataHandler);
 
@@ -108,13 +112,13 @@ public class TecTech {
     public void Load(FMLInitializationEvent event) {
         hasCOFH = Loader.isModLoaded(Reference.COFHCORE);
 
-        if(configTecTech.DISABLE_MATERIAL_LOADING_FFS){
+        if (configTecTech.DISABLE_MATERIAL_LOADING_FFS) {
             try {
-                Field modifiersField = Field.class.getDeclaredField( "modifiers" );
-                modifiersField.setAccessible( true );
-                Field field= GT_Proxy.class.getDeclaredField("mEvents");
+                Field modifiersField = Field.class.getDeclaredField("modifiers");
+                modifiersField.setAccessible(true);
+                Field field = GT_Proxy.class.getDeclaredField("mEvents");
                 field.setAccessible(true);
-                modifiersField.setInt( field, field.getModifiers() & ~Modifier.FINAL );
+                modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
                 field.set(GT_Mod.gregtechproxy, new Collection<Object>() {
                     @Override
                     public int size() {
@@ -203,9 +207,9 @@ public class TecTech {
 
     @Mod.EventHandler
     public void PostLoad(FMLPostInitializationEvent PostEvent) {
-        MainLoader.postLoad(definitionsRegistry,transformationInfo);
+        MainLoader.postLoad(definitionsRegistry, transformationInfo);
 
-        chunkDataHandler.registerChunkMetaDataHandler(anomalyHandler=new AnomalyHandler());
+        chunkDataHandler.registerChunkMetaDataHandler(anomalyHandler = new AnomalyHandler());
     }
 
     @Mod.EventHandler
@@ -213,7 +217,7 @@ public class TecTech {
         pEvent.registerServerCommand(new ConvertInteger());
         pEvent.registerServerCommand(new ConvertFloat());
         pEvent.registerServerCommand(new EMList());
-        if(DEBUG_MODE) {
+        if (DEBUG_MODE) {
             pEvent.registerServerCommand(new EMGive());
             pEvent.registerServerCommand(new CancerCommand());
             pEvent.registerServerCommand(new ChargeCommand());
-- 
cgit 


From 719fdf6f550c0ab9c69eedefed55aefbf5a07187 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Wed, 2 Feb 2022 17:38:28 +0100
Subject: Add world edit cui

---
 dependencies.gradle                                     |   1 +
 .../WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar    | Bin 0 -> 93851 bytes
 2 files changed, 1 insertion(+)
 create mode 100644 dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar

diff --git a/dependencies.gradle b/dependencies.gradle
index ed933b256e..93623cd034 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -45,4 +45,5 @@ dependencies {
     compile files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
     compile files("dependencies/AdvancedSolarPanel_1.7.10_Edition.jar")
     compile files("dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar")
+    compile files("dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar")
 }
diff --git a/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar b/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar
new file mode 100644
index 0000000000..2891f1480f
Binary files /dev/null and b/dependencies/WorldEditCuiFe-v1.0.7-mf-1.7.10-10.13.4.1566.jar differ
-- 
cgit 


From 527bac2a9c75b0aa57eaf7540e4b046bab68d913 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Wed, 2 Feb 2022 17:42:12 +0100
Subject: Cleanup master dependencies

---
 dependencies.gradle                                  |  17 ++++++-----------
 dependencies/AdvancedSolarPanel_1.7.10_Edition.jar   | Bin 305650 -> 0 bytes
 dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar | Bin 1461467 -> 0 bytes
 3 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 dependencies/AdvancedSolarPanel_1.7.10_Edition.jar
 delete mode 100644 dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar

diff --git a/dependencies.gradle b/dependencies.gradle
index ed933b256e..dca1d2612f 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -19,30 +19,25 @@ dependencies {
         transitive = false
     }*/
 
-    compile("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") {
+    compileOnly("com.github.GTNewHorizons:GTplusplus:master-SNAPSHOT:dev") {
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") {
         transitive = false
     }
 
-    compile("dan200.computercraft:ComputerCraft:1.75") {
+    compileOnly("dan200.computercraft:ComputerCraft:1.75") {
         transitive = false
     }
-    compile("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") {
+    compileOnly("li.cil.oc:OpenComputers:MC1.7.10-1.7.5.1356:dev") {
         transitive = false
     }
-    compile("curse.maven:cofh-core-69162:2388751") {
+    compileOnly("curse.maven:cofh-core-69162:2388751") {
         transitive = false
     }
-    compile("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
-        transitive = false
-    }
-    compile("com.azanor.baubles:Baubles:1.0.1.10:deobf") {
+    compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {
         transitive = false
     }
 
-    compile files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
-    compile files("dependencies/AdvancedSolarPanel_1.7.10_Edition.jar")
-    compile files("dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar")
+    compileOnly files("dependencies/OpenModularTurrets-1.7.10-2.2.10-237-deobf.jar")
 }
diff --git a/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar b/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar
deleted file mode 100644
index dfd00eb958..0000000000
Binary files a/dependencies/AdvancedSolarPanel_1.7.10_Edition.jar and /dev/null differ
diff --git a/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar b/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar
deleted file mode 100644
index 0361359748..0000000000
Binary files a/dependencies/worldedit-forge-mc1.7.10-6.1.1-dist.jar and /dev/null differ
-- 
cgit 


From 7df5d7ccf7b49746a0d45d4a1a2ab991f971e37d Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Wed, 2 Feb 2022 18:06:10 +0100
Subject: Merge branch 'master' into develop

# Conflicts:
#	dependencies.gradle
---
 AVRcore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AVRcore b/AVRcore
index 27bf45ba7b..3bdcf87f6e 160000
--- a/AVRcore
+++ b/AVRcore
@@ -1 +1 @@
-Subproject commit 27bf45ba7b08a0e3751b3e119e73441430bda49f
+Subproject commit 3bdcf87f6ed02b9e5f9a291b3e534c5d515e573b
-- 
cgit 


From 185702217c4e11e0f52c4483e184723c5f36af00 Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Wed, 2 Feb 2022 18:06:27 +0100
Subject: no message

---
 AVRcore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AVRcore b/AVRcore
index 27bf45ba7b..3bdcf87f6e 160000
--- a/AVRcore
+++ b/AVRcore
@@ -1 +1 @@
-Subproject commit 27bf45ba7b08a0e3751b3e119e73441430bda49f
+Subproject commit 3bdcf87f6ed02b9e5f9a291b3e534c5d515e573b
-- 
cgit 


From df9527663ef1b50f70fcf53f0934195d8f67565e Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sat, 5 Feb 2022 11:32:00 +0100
Subject: Initial Orbvital afffinity impl

---
 gradle.properties                                  |   2 +-
 .../java/com/github/technus/tectech/TecTech.java   |   2 +
 .../github/technus/tectech/loader/MainLoader.java  |  81 ++++----
 .../tectech/mechanics/anomaly/AnomalyHandler.java  | 212 +++++++++++----------
 .../tectech/mechanics/anomaly/MassCommand.java     |  77 ++++++++
 .../GT_MetaTileEntity_Hatch_OverflowElemental.java |   5 +-
 .../java/com/github/technus/tectech/util/Util.java |  20 ++
 7 files changed, 258 insertions(+), 141 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java

diff --git a/gradle.properties b/gradle.properties
index 3d49d30e98..7b41df262e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@ forgeVersion = 10.13.4.1614
 # restart Minecraft in development. Choose this dependent on your mod:
 # Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
 # Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
-developmentEnvironmentUserName = "Developer"
+developmentEnvironmentUserName = ""
 
 # Define a source file of your project with:
 # public static final String VERSION = "GRADLETOKEN_VERSION";
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 1248437e30..c281304205 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.loader.gui.CreativeTabEM;
 import com.github.technus.tectech.mechanics.anomaly.AnomalyHandler;
 import com.github.technus.tectech.mechanics.anomaly.CancerCommand;
 import com.github.technus.tectech.mechanics.anomaly.ChargeCommand;
+import com.github.technus.tectech.mechanics.anomaly.MassCommand;
 import com.github.technus.tectech.mechanics.commands.ConvertFloat;
 import com.github.technus.tectech.mechanics.commands.ConvertInteger;
 import com.github.technus.tectech.mechanics.data.ChunkDataHandler;
@@ -221,6 +222,7 @@ public class TecTech {
             pEvent.registerServerCommand(new EMGive());
             pEvent.registerServerCommand(new CancerCommand());
             pEvent.registerServerCommand(new ChargeCommand());
+            pEvent.registerServerCommand(new MassCommand());
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index 3b99cd987b..2a1bd59357 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -50,28 +50,29 @@ import static com.github.technus.tectech.TecTech.creativeTabTecTech;
 import static gregtech.api.enums.GT_Values.W;
 
 public final class MainLoader {
-    public static DamageSource microwaving, elementalPollution,subspace;
+    public static DamageSource microwaving, elementalPollution, subspace;
 
-    private MainLoader(){}
+    private MainLoader() {
+    }
 
-    public static void staticLoad(){
-        for(int i=0;i<16;i++){
-            GT_Values.V[i]=V[i];
-            GT_Values.VN[i]=VN[i];
-            GT_Values.VOLTAGE_NAMES[i]=VOLTAGE_NAMES[i];
+    public static void staticLoad() {
+        for (int i = 0; i < 16; i++) {
+            GT_Values.V[i] = V[i];
+            GT_Values.VN[i] = VN[i];
+            GT_Values.VOLTAGE_NAMES[i] = VOLTAGE_NAMES[i];
         }
         new ComponentLoader();
     }
 
-    public static void preLoad(){
-        creativeTabTecTech =new CreativeTabTecTech("TecTech");
-        creativeTabEM =new CreativeTabEM("EM");
+    public static void preLoad() {
+        creativeTabTecTech = new CreativeTabTecTech("TecTech");
+        creativeTabEM = new CreativeTabEM("EM");
 
         //set expanded texture arrays for tiers
         try {
             Textures.run();
-        }catch (Throwable t){
-            LOGGER.error("Loading textures...",t);
+        } catch (Throwable t) {
+            LOGGER.error("Loading textures...", t);
         }
     }
 
@@ -107,9 +108,9 @@ public final class MainLoader {
         LOGGER.info("Entities registered");
 
         progressBarLoad.step("Add damage types");
-        microwaving =new DamageSource("microwaving").setDamageBypassesArmor();
-        elementalPollution =new DamageSource("elementalPollution").setDamageBypassesArmor();
-        subspace =new DamageSource("subspace").setDamageBypassesArmor().setDamageIsAbsolute();
+        microwaving = new DamageSource("microwaving").setDamageBypassesArmor();
+        elementalPollution = new DamageSource("elementalPollution").setDamageBypassesArmor();
+        subspace = new DamageSource("subspace").setDamageBypassesArmor().setDamageIsAbsolute();
         LOGGER.info("Damage types addition Done");
 
         progressBarLoad.step("Register Packet Dispatcher");
@@ -128,16 +129,16 @@ public final class MainLoader {
         ProgressManager.ProgressBar progressBarPostLoad = ProgressManager.push("TecTech Post Loader", 4);
 
         progressBarPostLoad.step("Dreamcraft Compatibility");
-        if(Loader.isModLoaded(Reference.DREAMCRAFT)){
+        if (Loader.isModLoaded(Reference.DREAMCRAFT)) {
             try {
                 Class<?> clazz = Class.forName("com.dreammaster.gthandler.casings.GT_Container_CasingsNH");
-                TT_Container_Casings.sBlockCasingsNH = (Block)clazz.getField("sBlockCasingsNH").get(null);
+                TT_Container_Casings.sBlockCasingsNH = (Block) clazz.getField("sBlockCasingsNH").get(null);
 
-                if(TT_Container_Casings.sBlockCasingsNH==null){
+                if (TT_Container_Casings.sBlockCasingsNH == null) {
                     throw new NullPointerException("sBlockCasingsNH Is not set at this time");
                 }
-            }catch (Exception e){
-                throw new Error("Unable to get NH casings",e);
+            } catch (Exception e) {
+                throw new Error("Unable to get NH casings", e);
             }
         }
 
@@ -171,19 +172,19 @@ public final class MainLoader {
     }
 
     private static void registerExtraHazmats() {
-        ItemStack EMT_iqC=GT_ModHandler.getModItem("EMT","itemArmorQuantumChestplate",1,W);
-        ItemStack GRAVI_gC=GT_ModHandler.getModItem("GraviSuite","graviChestPlate",1,W);
-        ItemStack GRAVI_anC=GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, W);
+        ItemStack EMT_iqC   = GT_ModHandler.getModItem("EMT", "itemArmorQuantumChestplate", 1, W);
+        ItemStack GRAVI_gC  = GT_ModHandler.getModItem("GraviSuite", "graviChestPlate", 1, W);
+        ItemStack GRAVI_anC = GT_ModHandler.getModItem("GraviSuite", "advNanoChestPlate", 1, W);
 
-        ItemStack IC2_qH=GT_ModHandler.getIC2Item("quantumHelmet", 1L, W);
-        ItemStack IC2_qC=GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, W);
-        ItemStack IC2_qL=GT_ModHandler.getIC2Item("quantumLeggings", 1L, W);
-        ItemStack IC2_qB=GT_ModHandler.getIC2Item("quantumBoots", 1L, W);
+        ItemStack IC2_qH = GT_ModHandler.getIC2Item("quantumHelmet", 1L, W);
+        ItemStack IC2_qC = GT_ModHandler.getIC2Item("quantumBodyarmor", 1L, W);
+        ItemStack IC2_qL = GT_ModHandler.getIC2Item("quantumLeggings", 1L, W);
+        ItemStack IC2_qB = GT_ModHandler.getIC2Item("quantumBoots", 1L, W);
 
-        ItemStack IC2_nH=GT_ModHandler.getIC2Item("nanoHelmet", 1L, W);
-        ItemStack IC2_nC=GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, W);
-        ItemStack IC2_nL=GT_ModHandler.getIC2Item("nanoLeggings", 1L, W);
-        ItemStack IC2_nB=GT_ModHandler.getIC2Item("nanoBoots", 1L, W);
+        ItemStack IC2_nH = GT_ModHandler.getIC2Item("nanoHelmet", 1L, W);
+        ItemStack IC2_nC = GT_ModHandler.getIC2Item("nanoBodyarmor", 1L, W);
+        ItemStack IC2_nL = GT_ModHandler.getIC2Item("nanoLeggings", 1L, W);
+        ItemStack IC2_nB = GT_ModHandler.getIC2Item("nanoBoots", 1L, W);
 
         GregTech_API.sFrostHazmatList.add(EMT_iqC);
         GregTech_API.sFrostHazmatList.add(GRAVI_gC);
@@ -205,7 +206,7 @@ public final class MainLoader {
         GregTech_API.sBioHazmatList.add(IC2_qC);
         GregTech_API.sBioHazmatList.add(IC2_qL);
         GregTech_API.sBioHazmatList.add(IC2_qB);
-        
+
         GregTech_API.sBioHazmatList.add(GRAVI_anC);
         GregTech_API.sBioHazmatList.add(IC2_nH);
         GregTech_API.sBioHazmatList.add(IC2_nC);
@@ -218,7 +219,7 @@ public final class MainLoader {
         GregTech_API.sGasHazmatList.add(IC2_qC);
         GregTech_API.sGasHazmatList.add(IC2_qL);
         GregTech_API.sGasHazmatList.add(IC2_qB);
-        
+
         GregTech_API.sGasHazmatList.add(GRAVI_anC);
         GregTech_API.sGasHazmatList.add(IC2_nH);
         GregTech_API.sGasHazmatList.add(IC2_nC);
@@ -238,13 +239,13 @@ public final class MainLoader {
         GregTech_API.sElectroHazmatList.add(IC2_qC);
         GregTech_API.sElectroHazmatList.add(IC2_qL);
         GregTech_API.sElectroHazmatList.add(IC2_qB);
-        
+
         //todo add GC GS stuff
     }
 
     public static void addAfterGregTechPostLoadRunner() {
         GregTech_API.sAfterGTPostload.add(() -> {
-            if(TecTech.configTecTech.NERF_FUSION) {
+            if (TecTech.configTecTech.NERF_FUSION) {
                 FixBrokenFusionRecipes();
             }
             GT_MetaTileEntity_EM_collider.setValues(getFuelValue(Materials.Helium.getPlasma(125)));
@@ -306,7 +307,7 @@ public final class MainLoader {
 
     public static int getFuelValue(FluidStack aLiquid) {
         if (aLiquid == null || GT_Recipe.GT_Recipe_Map.sTurbineFuels == null) return 0;
-        FluidStack tLiquid;
+        FluidStack            tLiquid;
         Collection<GT_Recipe> tRecipeList = GT_Recipe.GT_Recipe_Map.sPlasmaFuels.mRecipeList;
         if (tRecipeList != null) for (GT_Recipe tFuel : tRecipeList)
             if ((tLiquid = GT_Utility.getFluidForFilledItem(tFuel.getRepresentativeInput(0), true)) != null)
@@ -314,8 +315,8 @@ public final class MainLoader {
         return 0;
     }
 
-    private static void fixBlocks(){
-        HashSet<String> modIDs=new HashSet<>(Arrays.asList(
+    private static void fixBlocks() {
+        HashSet<String> modIDs = new HashSet<>(Arrays.asList(
                 "minecraft",
                 "IC2",
                 "gregtech",
@@ -346,8 +347,8 @@ public final class MainLoader {
                 "utilityworlds",
                 Reference.MODID
         ));
-        for(Block block : GameData.getBlockRegistry().typeSafeIterable()) {
-            GameRegistry.UniqueIdentifier uniqueIdentifier=GameRegistry.findUniqueIdentifierFor(block);
+        for (Block block : GameData.getBlockRegistry().typeSafeIterable()) {
+            GameRegistry.UniqueIdentifier uniqueIdentifier = GameRegistry.findUniqueIdentifierFor(block);
             if (uniqueIdentifier != null) {
                 if (block.blockHardness < 0 || modIDs.contains(uniqueIdentifier.modId)) {
                     continue;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index 2ca1349489..a61490b162 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -33,21 +33,23 @@ import java.util.Map;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
+import static com.github.technus.tectech.util.Util.crossProduct3D;
+import static com.github.technus.tectech.util.Util.normalize3D;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
     private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;//can be const as it is computed later...
-    private static final int COUNT_DIV=32;
-    private static final double PER_PARTICLE=SWAP_THRESHOLD/COUNT_DIV;
-    private static final String INTENSITY = "intensity",SPACE_CANCER="space_cancer", SPACE_CHARGE ="space_charge", SPACE_MASS="space_mass";
-    private static final int MEAN_DELAY =50;
-    private static final double CANCER_EFFECTIVENESS = 1/ EM_COUNT_PER_MATERIAL_AMOUNT;
-    private static final double GRAVITY_EFFECTIVENESS =1;
-    private static final double CHARGE_EFFECTIVENESS = 10/ EM_COUNT_PER_MATERIAL_AMOUNT;
-    private static final double CHARGE_EXPLOSIVENESS = 5/ EM_COUNT_PER_MATERIAL_AMOUNT;
-
-    private boolean fixMe=false;
-    private final List<EntityPlayer> playersWithCharge = new ArrayList<>();
-    private final ArrayList<Chunk> worldDataArrayList = new ArrayList<>(512);
+    private static final int    COUNT_DIV      = 32;
+    private static final double PER_PARTICLE   = SWAP_THRESHOLD / COUNT_DIV;
+    private static final String INTENSITY      = "intensity", SPACE_CANCER = "space_cancer", SPACE_CHARGE = "space_charge", SPACE_MASS = "space_mass";
+    private static final int    MEAN_DELAY           = 50;
+    private static final double CANCER_EFFECTIVENESS = 1 / EM_COUNT_PER_MATERIAL_AMOUNT;
+    private static final double MASS_EFFECTIVENESS   = 1 / EM_COUNT_PER_MATERIAL_AMOUNT;
+    private static final double CHARGE_EFFECTIVENESS = 10 / EM_COUNT_PER_MATERIAL_AMOUNT;
+    private static final double CHARGE_EXPLOSIVENESS = 5 / EM_COUNT_PER_MATERIAL_AMOUNT;
+
+    private       boolean            fixMe              = false;
+    private final List<EntityPlayer> playersWithCharge  = new ArrayList<>();
+    private final ArrayList<Chunk>   worldDataArrayList = new ArrayList<>(512);
 
     @Override
     public String getTagName() {
@@ -68,7 +70,7 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     @Override
     public void tickWorld(HashMap<Integer, ChunkDataHandler.ChunkHashMap> data, TickEvent.WorldTickEvent aEvent) {
         if (TecTech.RANDOM.nextInt(MEAN_DELAY) == 0) {
-            int dim = aEvent.world.provider.dimensionId;
+            int                           dim          = aEvent.world.provider.dimensionId;
             ChunkDataHandler.ChunkHashMap chunkHashMap = data.get(dim);
             chunkHashMap.forEach((chunkCoordIntPair, compound) -> {
                 if (compound.getDouble(INTENSITY) > SWAP_THRESHOLD) {
@@ -79,17 +81,17 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 }
             });
             if (worldDataArrayList.size() >= 2) {
-                Chunk a = worldDataArrayList.remove(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
-                Chunk b = worldDataArrayList.get(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
+                Chunk             a       = worldDataArrayList.remove(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
+                Chunk             b       = worldDataArrayList.get(TecTech.RANDOM.nextInt(worldDataArrayList.size()));
                 ChunkCoordIntPair aCoords = a.getChunkCoordIntPair();
                 ChunkCoordIntPair bCoords = b.getChunkCoordIntPair();
 
                 double newValue = (chunkHashMap.get(aCoords).getDouble(INTENSITY) +
-                        chunkHashMap.get(bCoords).getDouble(INTENSITY))/2-SWAP_THRESHOLD/8;
-                float split=TecTech.RANDOM.nextFloat();
+                        chunkHashMap.get(bCoords).getDouble(INTENSITY)) / 2 - SWAP_THRESHOLD / 8;
+                float split = TecTech.RANDOM.nextFloat();
 
                 chunkHashMap.get(aCoords).setDouble(INTENSITY, newValue * split);
-                chunkHashMap.get(bCoords).setDouble(INTENSITY, newValue * (1-split));
+                chunkHashMap.get(bCoords).setDouble(INTENSITY, newValue * (1 - split));
                 chunkHashMap.markForTransmissionToClient(aCoords);
                 chunkHashMap.markForTransmissionToClient(bCoords);
                 swapSomething(a, b, newValue);
@@ -111,20 +113,20 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                     if (other == player) {
                         continue outer;
                     }
-                    double field = getCharge(player);
+                    double field         = getCharge(player);
                     double absDifference = Math.abs(field - fieldOther);
                     if (absDifference != 0) {
                         if (player.getDistanceSqToEntity(other) < 1) {
                             double avg = (fieldOther + field) / 2;
                             //addAnomaly(other.worldObj.provider.dimensionId, new ChunkCoordIntPair(other.chunkCoordX, other.chunkCoordZ), Math.min(SWAP_THRESHOLD, PER_PARTICLE * absDifference));
-                            if(TecTech.configTecTech.BOOM_ENABLE){
-                                other.worldObj.createExplosion(other, other.posX, other.posY, other.posZ,(float) Math.min(CHARGE_EXPLOSIVENESS * absDifference, 25), true);
+                            if (TecTech.configTecTech.BOOM_ENABLE) {
+                                other.worldObj.createExplosion(other, other.posX, other.posY, other.posZ, (float) Math.min(CHARGE_EXPLOSIVENESS * absDifference, 25), true);
                                 player.worldObj.createExplosion(player, player.posX, player.posY, player.posZ, (float) Math.min(CHARGE_EXPLOSIVENESS * absDifference, 25), true);
                             }
-                            GT_Utility.sendSoundToPlayers(other.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int)other.posX, (int)other.posY, (int)other.posZ);
-                            GT_Utility.sendSoundToPlayers(player.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int)player.posX, (int)player.posY, (int)player.posZ);
-                            setCharge(player,avg);
-                            setCharge(other,avg);
+                            GT_Utility.sendSoundToPlayers(other.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int) other.posX, (int) other.posY, (int) other.posZ);
+                            GT_Utility.sendSoundToPlayers(player.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (int) player.posX, (int) player.posY, (int) player.posZ);
+                            setCharge(player, avg);
+                            setCharge(other, avg);
                         }
                     }
                 }
@@ -133,16 +135,16 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         }
     }
 
-    private void swapSomething(Chunk a,Chunk b,double mass) {
-        float explosionPower=(float) Math.log(mass/ EM_COUNT_PER_MATERIAL_AMOUNT);
-        for (int i = 0; i < Math.min((int)explosionPower,64); i++) {
-            int x = TecTech.RANDOM.nextInt(16);
-            int y = TecTech.RANDOM.nextInt(a.worldObj.getActualHeight());
-            int z = TecTech.RANDOM.nextInt(16);
+    private void swapSomething(Chunk a, Chunk b, double mass) {
+        float explosionPower = (float) Math.log(mass / EM_COUNT_PER_MATERIAL_AMOUNT);
+        for (int i = 0; i < Math.min((int) explosionPower, 64); i++) {
+            int   x      = TecTech.RANDOM.nextInt(16);
+            int   y      = TecTech.RANDOM.nextInt(a.worldObj.getActualHeight());
+            int   z      = TecTech.RANDOM.nextInt(16);
             Block aBlock = a.getBlock(x, y, z);
             Block bBlock = a.getBlock(x, y, z);
-            int aMeta = a.getBlockMetadata(x, y, z);
-            int bMeta = a.getBlockMetadata(x, y, z);
+            int   aMeta  = a.getBlockMetadata(x, y, z);
+            int   bMeta  = a.getBlockMetadata(x, y, z);
             if (a.getTileEntityUnsafe(x, y, z) == null && b.getTileEntityUnsafe(x, y, z) == null) {
                 a.worldObj.setBlock((a.xPosition << 4) + x, y, (a.zPosition << 4) + z, bBlock, bMeta, 3);
                 b.worldObj.setBlock((b.xPosition << 4) + x, y, (b.zPosition << 4) + z, aBlock, aMeta, 3);
@@ -156,19 +158,19 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 a.worldObj.setBlockToAir((a.xPosition << 4) + x, y, (a.zPosition << 4) + z);
                 b.worldObj.setBlockToAir((b.xPosition << 4) + x, y, (b.zPosition << 4) + z);
             }
-            if(TecTech.configTecTech.BOOM_ENABLE){
+            if (TecTech.configTecTech.BOOM_ENABLE) {
                 if (TecTech.RANDOM.nextBoolean()) {
-                    a.worldObj.createExplosion(null, (a.xPosition << 4) + x + .5, y + .5, (a.zPosition << 4) + z + .5, explosionPower*TecTech.RANDOM.nextFloat(), true);
+                    a.worldObj.createExplosion(null, (a.xPosition << 4) + x + .5, y + .5, (a.zPosition << 4) + z + .5, explosionPower * TecTech.RANDOM.nextFloat(), true);
                 }
                 GT_Utility.sendSoundToPlayers(a.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (a.xPosition << 4) + x, y, (a.zPosition << 4) + z);
                 if (TecTech.RANDOM.nextBoolean()) {
-                    b.worldObj.createExplosion(null, (b.xPosition << 4) + x + .5, y + .5, (b.zPosition << 4) + z + .5, explosionPower*TecTech.RANDOM.nextFloat(), true);
+                    b.worldObj.createExplosion(null, (b.xPosition << 4) + x + .5, y + .5, (b.zPosition << 4) + z + .5, explosionPower * TecTech.RANDOM.nextFloat(), true);
                 }
                 GT_Utility.sendSoundToPlayers(b.worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1, (b.xPosition << 4) + x, y, (b.zPosition << 4) + z);
             }
         }
-        int x = (b.xPosition - a.xPosition) << 4;
-        int z = (b.xPosition - a.xPosition) << 4;
+        int                    x  = (b.xPosition - a.xPosition) << 4;
+        int                    z  = (b.xPosition - a.xPosition) << 4;
         List<EntityLivingBase> aE = a.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(a));
         List<EntityLivingBase> bE = b.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(b));
         for (EntityLivingBase entityLivingBase : aE) {
@@ -220,9 +222,9 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     @Override
     public void tickPlayer(HashMap<Integer, ChunkDataHandler.ChunkHashMap> data, TickEvent.PlayerTickEvent aEvent) {
         if (aEvent.side.isClient()) {
-            EntityPlayer player = TecTech.proxy.getPlayer();
-            ChunkCoordIntPair pair = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ);
-            NBTTagCompound compound = data.get(player.worldObj.provider.dimensionId).get(pair);
+            EntityPlayer      player   = TecTech.proxy.getPlayer();
+            ChunkCoordIntPair pair     = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ);
+            NBTTagCompound    compound = data.get(player.worldObj.provider.dimensionId).get(pair);
             if (compound != null) {
                 for (int i = 0, badness = (int) Math.min(COUNT_DIV, compound.getDouble(INTENSITY) / PER_PARTICLE); i < badness; i++) {
                     TecTech.proxy.em_particle(player.worldObj,
@@ -245,18 +247,18 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 }
             }
         } else if (TecTech.RANDOM.nextInt(50) == 0) {
-            EntityPlayer player = aEvent.player;
-            ChunkCoordIntPair pair = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ);
-            NBTTagCompound compound = data.get(player.worldObj.provider.dimensionId).get(pair);
-            NBTTagCompound playerTag = TecTech.playerPersistence.getDataOrSetToNewTag(player);
-            boolean saveRequired = false;
+            EntityPlayer      player       = aEvent.player;
+            ChunkCoordIntPair pair         = new ChunkCoordIntPair(player.chunkCoordX, player.chunkCoordZ);
+            NBTTagCompound    compound     = data.get(player.worldObj.provider.dimensionId).get(pair);
+            NBTTagCompound    playerTag    = TecTech.playerPersistence.getDataOrSetToNewTag(player);
+            boolean           saveRequired = false;
             if (!player.capabilities.isCreativeMode) {
-                double cancer=getCancer(player);
+                double cancer = getCancer(player);
                 if (compound != null) {
                     int badness = (int) Math.min(COUNT_DIV, compound.getDouble(INTENSITY) / PER_PARTICLE);
                     if (badness > 0) {
                         playerTag.setDouble(SPACE_CANCER, Math.min(2, cancer + 9.765625E-4f * badness));
-                        player.attackEntityFrom(MainLoader.subspace,Math.max(1,badness/8f));
+                        player.attackEntityFrom(MainLoader.subspace, Math.max(1, badness / 8f));
                         saveRequired = true;
                     }
                 } else if (playerTag.getDouble(SPACE_CANCER) > 0 && !player.isDead) {
@@ -276,14 +278,14 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
 
     @Override
     public void tickRender(HashMap<Integer, ChunkDataHandler.ChunkHashMap> data, TickEvent.RenderTickEvent aEvent) {
-        EntityPlayer player=TecTech.proxy.getPlayer();
-        if(player!=null) {
-            if(!player.capabilities.isCreativeMode) {
-                double cancer = getCancer(player)*CANCER_EFFECTIVENESS;
+        EntityPlayer player = TecTech.proxy.getPlayer();
+        if (player != null) {
+            if (!player.capabilities.isCreativeMode) {
+                double cancer = getCancer(player) * CANCER_EFFECTIVENESS;
                 if (cancer > 0) {
                     player.setInvisible(fixMe = TecTech.RANDOM.nextFloat() * 2 < cancer);
                     player.setAngles((TecTech.RANDOM.nextFloat() - .5F) * 36 * (float) cancer, (TecTech.RANDOM.nextFloat() - .5F) * 36 * (float) cancer);
-                    cancer*=cancer/2F;
+                    cancer *= cancer / 2F;
                     if (cancer > 1.75f) {
                         player.setVelocity((TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer, (TecTech.RANDOM.nextFloat() - .5F) * cancer);
                     } else {
@@ -292,23 +294,22 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                 }
 
                 double charge = getCharge(player);
-                if(charge!=0) {
+                if (charge != 0) {
                     for (Object o : player.worldObj.playerEntities) {
                         if (o instanceof EntityPlayer && !((EntityPlayer) o).capabilities.isCreativeMode) {
-                            EntityPlayer otherPlayer=(EntityPlayer)o;
-                            double chargeOther = getCharge(otherPlayer);
+                            EntityPlayer otherPlayer = (EntityPlayer) o;
+                            double       chargeOther = getCharge(otherPlayer);
                             if (chargeOther != 0 && player != o) {
                                 double reaction = chargeOther * charge;
-                                if (reaction !=0) {
+                                if (reaction != 0) {
                                     double distanceSq = otherPlayer.getDistanceSqToEntity(player);
                                     if (distanceSq >= 1) {
                                         double effect = CHARGE_EFFECTIVENESS * reaction / (distanceSq * distanceSq * distanceSq);
-                                        double dX = player.posX - otherPlayer.posX;
-                                        double dY = player.posY - otherPlayer.posY;
-                                        double dZ = player.posZ - otherPlayer.posZ;
-                                        player.addVelocity(effect * dX, effect * dY, effect * dZ);
-                                        effect=-effect;
-                                        otherPlayer.addVelocity(effect * dX, effect * dY, effect * dZ);
+                                        double dX     = (player.posX - otherPlayer.posX) * effect;
+                                        double dY     = (player.posY - otherPlayer.posY) * effect;
+                                        double dZ     = (player.posZ - otherPlayer.posZ) * effect;
+                                        player.addVelocity(dX, dY, dZ);
+                                        otherPlayer.addVelocity(-dX, -dY, -dZ);
                                     }
                                 }
                             }
@@ -316,35 +317,38 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
                     }
                 }
 
-                float mass=TecTech.playerPersistence.getDataOrSetToNewTag(player).getFloat(SPACE_MASS);
-                if(mass!=0) {
+                double mass = getMass(player);
+                if (mass != 0) {
                     for (Object o : player.worldObj.playerEntities) {
                         if (o instanceof EntityPlayer && !((EntityPlayer) o).capabilities.isCreativeMode) {
-                            EntityPlayer otherPlayer=(EntityPlayer)o;
-                            float massOther = TecTech.playerPersistence.getDataOrSetToNewTag(otherPlayer).getFloat(SPACE_MASS);
+                            EntityPlayer otherPlayer = (EntityPlayer) o;
+                            double       massOther   = getMass(otherPlayer);
                             if (massOther != 0 && player != o) {
-                                float reaction = massOther * mass;
-                                if (reaction !=0) {
+                                double reaction = massOther * mass;
+                                if (reaction != 0) {
                                     double distanceSq = otherPlayer.getDistanceSqToEntity(player);
                                     if (distanceSq >= 1) {
-                                        double effect = GRAVITY_EFFECTIVENESS * reaction / (distanceSq * distanceSq * distanceSq);
-                                        double dX = player.posX - otherPlayer.posX;
-                                        double dY = player.posY - otherPlayer.posY;
-                                        double dZ = player.posZ - otherPlayer.posZ;
-                                        otherPlayer.addVelocity(effect * dX, effect * dY, effect * dZ);
-                                        effect=-effect;
-                                        player.addVelocity(effect * dX, effect * dY, effect * dZ);
+                                        double   effect  = MASS_EFFECTIVENESS * reaction / (distanceSq * distanceSq * distanceSq);
+                                        double   effect1 = effect / mass;
+                                        double   effect2 = effect / massOther;
+                                        double[] dPos    = new double[]{player.posX - otherPlayer.posX, player.posY - otherPlayer.posY, player.posZ - otherPlayer.posZ};
+                                        double[] vel     = new double[]{player.motionX, player.motionY, player.motionZ};
+                                        double[] out     = new double[3];
+                                        crossProduct3D(dPos, vel, out);
+                                        crossProduct3D(out, dPos, vel);
+                                        normalize3D(vel,out);
+                                        player.addVelocity(effect1 * out[0], effect1 * out[1], effect1 * out[2]);
+                                        otherPlayer.addVelocity(effect2 * -out[0], effect2 * -out[1], effect2 * -out[2]);
                                     }
                                 }
                             }
                         }
                     }
-
                 }
             }
-            if (fixMe){
+            if (fixMe) {
                 player.setInvisible(false);
-                fixMe=false;
+                fixMe = false;
             }
         }
     }
@@ -365,14 +369,14 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
     }
 
     public void addAnomaly(IGregTechTileEntity gtTile, double amount) {
-        addAnomaly(gtTile.getWorld(),gtTile.getXCoord(),gtTile.getZCoord(),amount);
+        addAnomaly(gtTile.getWorld(), gtTile.getXCoord(), gtTile.getZCoord(), amount);
     }
 
     public void addAnomaly(TileEntity tileEntity, double amount) {
-        addAnomaly(tileEntity.getWorldObj(),tileEntity.xCoord,tileEntity.zCoord,amount);
+        addAnomaly(tileEntity.getWorldObj(), tileEntity.xCoord, tileEntity.zCoord, amount);
     }
 
-    public void addAnomaly(World w,int x,int z, double amount) {
+    public void addAnomaly(World w, int x, int z, double amount) {
         if (!w.isRemote) {
             addAnomaly(w.provider.dimensionId,
                     new ChunkCoordIntPair(
@@ -394,43 +398,55 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         TecTech.chunkDataHandler.getChunkData(this, world).markForTransmissionToClient(chunk);
     }
 
-    public double getCharge(EntityPlayer player){
-        return getDouble(player,SPACE_CHARGE);
+    public double getCharge(EntityPlayer player) {
+        return getDouble(player, SPACE_CHARGE);
+    }
+
+    public void setCharge(EntityPlayer player, double amount) {
+        setDouble(player, SPACE_CHARGE, amount);
+    }
+
+    public void addCharge(EntityPlayer player, double amount) {
+        addDouble(player, SPACE_CHARGE, amount);
+    }
+
+    public double getMass(EntityPlayer player) {
+        return getDouble(player, SPACE_MASS);
     }
 
-    public void setCharge(EntityPlayer player, double amount){
-        setDouble(player,SPACE_CHARGE,amount);
+    public void setMass(EntityPlayer player, double amount) {
+        setDouble(player, SPACE_MASS, amount);
     }
 
-    public void addCharge(EntityPlayer player, double amount){
-        addDouble(player,SPACE_CHARGE,amount);
+    public void addMass(EntityPlayer player, double amount) {
+        addDouble(player, SPACE_MASS, amount);
     }
 
-    public double getCancer(EntityPlayer player){
-        return getDouble(player,SPACE_CANCER);
+    public double getCancer(EntityPlayer player) {
+        return getDouble(player, SPACE_CANCER);
     }
 
-    public void setCancer(EntityPlayer player, double amount){
-        setDouble(player,SPACE_CANCER,amount);
+    public void setCancer(EntityPlayer player, double amount) {
+        setDouble(player, SPACE_CANCER, amount);
     }
 
-    public void addCancer(EntityPlayer player, double amount){
-        addDouble(player,SPACE_CANCER,amount);
+    public void addCancer(EntityPlayer player, double amount) {
+        addDouble(player, SPACE_CANCER, amount);
     }
 
-    public double getDouble(EntityPlayer player,String name){
+    public double getDouble(EntityPlayer player, String name) {
         return TecTech.playerPersistence.getDataOrSetToNewTag(player).getDouble(name);
     }
 
-    public void setDouble(EntityPlayer player,String name, double amount){
+    public void setDouble(EntityPlayer player, String name, double amount) {
         TecTech.playerPersistence.getDataOrSetToNewTag(player).setDouble(name, amount);
         TecTech.playerPersistence.saveData(player);
         NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
     }
 
-    public void addDouble(EntityPlayer player,String name, double amount){
+    public void addDouble(EntityPlayer player, String name, double amount) {
         NBTTagCompound data = TecTech.playerPersistence.getDataOrSetToNewTag(player);
-        data.setDouble(name, amount+data.getDouble(name));
+        data.setDouble(name, amount + data.getDouble(name));
         TecTech.playerPersistence.saveData(player);
         NetworkDispatcher.INSTANCE.sendToAll(new PlayerDataMessage.PlayerDataData(player));
     }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java
new file mode 100644
index 0000000000..3d0ade5082
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/MassCommand.java
@@ -0,0 +1,77 @@
+package com.github.technus.tectech.mechanics.anomaly;
+
+import com.github.technus.tectech.TecTech;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.util.ChatComponentText;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MassCommand implements ICommand {
+    ArrayList<String> aliases=new ArrayList<>();
+
+    public MassCommand(){
+        aliases.add("mass_EM");
+        aliases.add("mass");
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (sender instanceof EntityPlayerMP && !sender.getEntityWorld().isRemote) {
+            double amount;
+            try {
+                amount = Double.parseDouble(args[0]);
+            }catch (NumberFormatException e){
+                sender.addChatMessage(new ChatComponentText("Cannot parse amount!"));
+                return;
+            }
+            EntityPlayerMP player=(EntityPlayerMP)sender;
+            if(player.capabilities.isCreativeMode){
+                sender.addChatMessage(new ChatComponentText("Doesn't really work in creative mode!"));
+            }else {
+                TecTech.anomalyHandler.setMass(player,amount);
+                sender.addChatMessage(new ChatComponentText("Mass set to: "+amount));
+            }
+        }
+    }
+
+    @Override
+    public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) {
+        return false;
+    }
+
+    @Override
+    public List<String> getCommandAliases() {
+        return aliases;
+    }
+
+    @Override
+    public String getCommandName() {
+        return aliases.get(0);
+    }
+
+    @Override
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        return null;
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender p_71518_1_) {
+        return "mass_EM [Amount]";
+    }
+
+    @Override
+    public int compareTo(Object o) {
+        if(o instanceof ICommand){
+            return getCommandName().compareTo(((ICommand) o).getCommandName());
+        }
+        return 0;
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
index 2a04af23d1..8b55c16831 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
@@ -27,8 +27,6 @@ import net.minecraft.world.EnumSkyBlock;
 import net.minecraftforge.common.util.ForgeDirection;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
-import java.util.Locale;
-
 import static com.github.technus.tectech.loader.MainLoader.elementalPollution;
 import static com.github.technus.tectech.util.CommonValues.DISPERSE_AT;
 import static com.github.technus.tectech.util.CommonValues.V;
@@ -188,6 +186,9 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
             ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.confusion.id, 1, (int) (damagingFactor * 20)));
             ((EntityLivingBase) entity).addPotionEffect(new PotionEffect(Potion.wither.id, 2, (int) (damagingFactor * 15)));
             ((EntityLivingBase) entity).attackEntityFrom(elementalPollution, damagingFactor);
+            if(entity instanceof EntityPlayer) {
+                TecTech.anomalyHandler.addMass((EntityPlayer) entity,overflowDisperse);
+            }
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/util/Util.java b/src/main/java/com/github/technus/tectech/util/Util.java
index 78522a2ae8..489246e061 100644
--- a/src/main/java/com/github/technus/tectech/util/Util.java
+++ b/src/main/java/com/github/technus/tectech/util/Util.java
@@ -573,4 +573,24 @@ public final class Util {
         }
         return stringBuilder.toString();
     }
+
+    public static double getMagnitude3D(double in[])
+    {
+        return Math.sqrt(in[0]*in[0]+in[1]*in[1]+in[2]*in[2]);
+    }
+
+    public static void normalize3D(double in[], double out[])
+    {
+        double mag=getMagnitude3D(in);
+        out[0]=in[0]/mag;
+        out[1]=in[1]/mag;
+        out[2]=in[2]/mag;
+    }
+
+    public static void crossProduct3D(double inA[], double inB[], double out[])
+    {
+        out[0] = inA[1] * inB[2] - inA[2] * inB[1];
+        out[1] = inA[2] * inB[0] - inA[0] * inB[2];
+        out[2] = inA[0] * inB[1] - inA[1] * inB[0];
+    }
 }
-- 
cgit 


From 9c10b4c63b9c4ea551719c8a059d36ea01c5b89e Mon Sep 17 00:00:00 2001
From: Tec <daniel112092@gmail.com>
Date: Sun, 6 Feb 2022 11:08:29 +0100
Subject: Update TT_Utility

---
 .../dreamcraft/NoDreamCraftMachineLoader.java      |  34 +-
 .../definitions/EMComplexAspectDefinition.java     |  16 +-
 .../tectech/mechanics/anomaly/AnomalyHandler.java  |  10 +-
 .../tectech/mechanics/commands/ConvertFloat.java   |   4 +-
 .../tectech/mechanics/commands/ConvertInteger.java |   4 +-
 .../tectech/mechanics/data/ChunkDataMessage.java   |   4 +-
 .../tectech/mechanics/data/PlayerPersistence.java  |   6 +-
 .../elementalMatter/core/commands/EMList.java      |   4 +-
 .../core/definitions/EMPrimitiveTemplate.java      |   2 +-
 .../core/maps/EMInstanceStackMap.java              |  20 +-
 .../elementalMatter/core/maps/EMStackMap.java      |  13 +-
 .../elementalMatter/core/maps/IEMMapRead.java      |   2 +-
 .../core/stacks/EMInstanceStack.java               |  20 +-
 .../definitions/complex/EMAtomDefinition.java      |  18 +-
 .../definitions/complex/EMHadronDefinition.java    |  16 +-
 .../definitions/complex/EMNuclideIAEA.java         |   2 +-
 .../tectech/nei/TT_NEI_ResearchHandler.java        |   4 +-
 .../technus/tectech/nei/TT_NEI_ScannerHandler.java |   4 +-
 .../thing/cover/GT_Cover_TM_EnderFluidLink.java    |   3 +-
 .../item/DebugElementalInstanceContainer_EM.java   |   6 +-
 .../item/ElementalDefinitionContainer_EM.java      |   6 +-
 .../item/ElementalDefinitionScanStorage_EM.java    |   6 +-
 .../tectech/thing/item/ParametrizerMemoryCard.java |   6 +-
 .../hatch/GT_MetaTileEntity_Hatch_Capacitor.java   |   6 +-
 .../GT_MetaTileEntity_Hatch_CreativeData.java      |   4 +-
 ...T_MetaTileEntity_Hatch_CreativeMaintenance.java |   4 +-
 .../GT_MetaTileEntity_Hatch_DataConnector.java     |   4 +-
 .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java |   4 +-
 .../GT_MetaTileEntity_Hatch_DynamoTunnel.java      |   4 +-
 ...GT_MetaTileEntity_Hatch_ElementalContainer.java |   9 +-
 .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java |   6 +-
 .../GT_MetaTileEntity_Hatch_EnergyTunnel.java      |   8 +-
 .../hatch/GT_MetaTileEntity_Hatch_Holder.java      |   4 +-
 .../hatch/GT_MetaTileEntity_Hatch_InputData.java   |   4 +-
 .../GT_MetaTileEntity_Hatch_InputDataItems.java    |   4 +-
 .../GT_MetaTileEntity_Hatch_InputElemental.java    |   4 +-
 .../hatch/GT_MetaTileEntity_Hatch_OutputData.java  |   4 +-
 .../GT_MetaTileEntity_Hatch_OutputDataItems.java   |   4 +-
 .../GT_MetaTileEntity_Hatch_OutputElemental.java   |   4 +-
 .../GT_MetaTileEntity_Hatch_OverflowElemental.java |  15 +-
 .../hatch/GT_MetaTileEntity_Hatch_Param.java       |   4 +-
 .../hatch/GT_MetaTileEntity_Hatch_Rack.java        |   6 +-
 .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java |   4 +-
 .../hatch/TextParametersMessage.java               |   6 +-
 .../hatch/gui/GT_Container_Param.java              |  22 +-
 .../hatch/gui/GT_Container_ParamAdv.java           |  26 +-
 .../hatch/gui/GT_Container_ParamText.java          |  22 +-
 .../hatch/gui/GT_GUIContainer_Param.java           |  17 +-
 .../hatch/gui/GT_GUIContainer_ParamAdv.java        |  17 +-
 .../hatch/gui/GT_GUIContainer_ParamText.java       |  20 +-
 .../multi/GT_MetaTileEntity_EM_computer.java       |   4 +-
 .../multi/GT_MetaTileEntity_EM_quantizer.java      |   2 +-
 .../multi/GT_MetaTileEntity_EM_scanner.java        |   2 +-
 .../multi/base/GT_Container_MultiMachineEM.java    |  10 +-
 .../base/GT_MetaTileEntity_MultiblockBase_EM.java  |   8 +-
 .../em_machine/GT_MetaTileEntity_EM_machine.java   |  10 +-
 .../single/GT_MetaTileEntity_BuckConverter.java    |   6 +-
 .../single/GT_MetaTileEntity_DataReader.java       |  22 +-
 .../single/GT_MetaTileEntity_DebugPollutor.java    |   6 +-
 .../GT_MetaTileEntity_DebugPowerGenerator.java     |   6 +-
 .../GT_MetaTileEntity_DebugStructureWriter.java    |  10 +-
 .../single/GT_MetaTileEntity_MicroController.java  |   6 +-
 .../single/GT_MetaTileEntity_OwnerDetector.java    |   6 +-
 .../single/GT_MetaTileEntity_TT_Transformer.java   |   6 +-
 .../single/GT_MetaTileEntity_TeslaCoil.java        |   5 +-
 .../single/gui/GT_Container_DebugPollutor.java     |  10 +-
 .../single/gui/GT_GUIContainer_BuckConverter.java  |   4 +-
 .../single/gui/GT_GUIContainer_DataReader.java     |   9 +-
 .../gui/GT_GUIContainer_DebugPowerGenerator.java   |   4 +-
 .../github/technus/tectech/util/TT_Utility.java    | 613 +++++++++++++++++++++
 .../java/com/github/technus/tectech/util/Util.java | 596 --------------------
 src/main/resources/assets/tectech/lang/en_US.lang  |   3 +
 72 files changed, 899 insertions(+), 895 deletions(-)
 create mode 100644 src/main/java/com/github/technus/tectech/util/TT_Utility.java
 delete mode 100644 src/main/java/com/github/technus/tectech/util/Util.java

diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java
index 798ffec36c..c8eda64bea 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.compatibility.dreamcraft;
 
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TT_Transformer;
 import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_WetTransformer;
@@ -105,7 +105,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11230, "hull.tier.10", "UEV Machine Hull", 10,
                     imagination);
-            Util.setTier(10, temp);
+            TT_Utility.setTier(10, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -114,7 +114,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11231, "hull.tier.11", "UIV Machine Hull", 11,
                     imagination);
-            Util.setTier(11, temp);
+            TT_Utility.setTier(11, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -123,7 +123,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11232, "hull.tier.12", "UMV Machine Hull", 12,
                     imagination);
-            Util.setTier(12, temp);
+            TT_Utility.setTier(12, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -132,7 +132,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11233, "hull.tier.13", "UXV Machine Hull", 13,
                     imagination);
-            Util.setTier(13, temp);
+            TT_Utility.setTier(13, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -141,7 +141,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11234, "hull.tier.14", "OPV Machine Hull", 14,
                     imagination);
-            Util.setTier(14, temp);
+            TT_Utility.setTier(14, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -150,7 +150,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
             temp = new GT_MetaTileEntity_BasicHull(
                     11235, "hull.tier.15", "MAX Machine Hull", 15,
                     imagination);
-            Util.setTier(15, temp);
+            TT_Utility.setTier(15, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -162,7 +162,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11221, "tt.transformer.tier.10", "Extremely Ultimate Transformer", 10);//UIV -> UEV (Use Soft Mallet to invert)
-            Util.setTier(10, temp);
+            TT_Utility.setTier(10, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -170,7 +170,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11222, "tt.transformer.tier.11", "Insanely Ultimate Transformer", 11);//UMV -> UIV (Use Soft Mallet to invert)
-            Util.setTier(11, temp);
+            TT_Utility.setTier(11, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -178,7 +178,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11223, "tt.transformer.tier.12", "Mega Ultimate Transformer", 12);//UXV -> UMV (Use Soft Mallet to invert)
-            Util.setTier(12, temp);
+            TT_Utility.setTier(12, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -186,7 +186,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11224, "tt.transformer.tier.13", "Extended Mega Ultimate Transformer", 13);//OPV -> UXV (Use Soft Mallet to invert)
-            Util.setTier(13, temp);
+            TT_Utility.setTier(13, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -194,7 +194,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
 
             temp = new GT_MetaTileEntity_TT_Transformer(
                     11225, "tt.transformer.tier.14", "Overpowered Transformer", 14);//MAX -> OPV (Use Soft Mallet to invert)
-            Util.setTier(14, temp);
+            TT_Utility.setTier(14, temp);
             if (GT_Values.GT.isClientSide()) {
                 field.set(temp, method.invoke(temp, iTexture));
             }
@@ -215,7 +215,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11910, "transformer.ha.tier.10", "Extremely Ultimate Hi-Amp Transformer", 10,
                         //UIV -> UEV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.10.desc"));
-                Util.setTier(10, temp);
+                TT_Utility.setTier(10, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -225,7 +225,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11911, "transformer.ha.tier.11", "Insanely Ultimate Hi-Amp Transformer", 11,
                         //UMV -> UIV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.11.desc"));
-                Util.setTier(11, temp);
+                TT_Utility.setTier(11, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -235,7 +235,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11912, "transformer.ha.tier.12", "Mega Ultimate Hi-Amp Transformer", 12,
                         //UXV -> UMV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.12.desc"));
-                Util.setTier(12, temp);
+                TT_Utility.setTier(12, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -245,7 +245,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11913, "transformer.ha.tier.13", "Extended Mega Ultimate Hi-Amp Transformer", 13,
                         //OPV -> UXV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.13.desc"));
-                Util.setTier(13, temp);
+                TT_Utility.setTier(13, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
@@ -255,7 +255,7 @@ public class NoDreamCraftMachineLoader implements Runnable {
                         11914, "transformer.ha.tier.14", "Overpowered Hi-Amp Transformer", 14,
                         //MAX -> OPV (Use Soft Mallet to invert)
                         translateToLocal("gt.blockmachines.transformer.ha.tier.14.desc"));
-                Util.setTier(14, temp);
+                TT_Utility.setTier(14, temp);
                 if (GT_Values.GT.isClientSide()) {
                     field.set(temp, method.invoke(temp, iTexture));
                 }
diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
index 8c90dc939c..be1ed9bd51 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/elementalMatter/definitions/EMComplexAspectDefinition.java
@@ -10,7 +10,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.reg
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 
 import java.util.ArrayList;
 
@@ -233,30 +233,30 @@ public final class EMComplexAspectDefinition extends EMComplexTemplate {
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
             lines.add(translateToLocal("tt.keyword.CLASS") + " = " + nbtType + ' ' + getMatterMassType());
         }
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.NAME") + " = " + getLocalizedName());
             //lines.add("SYMBOL = "+getSymbol());
         }
-        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add(translateToLocal("tt.keyword.CHARGE") + " = " + getCharge() / 3f + " e");
         }
-        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_COLOR, capabilities)) {
             lines.add(hasColor() ? translateToLocal("tt.keyword.COLORLESS") : translateToLocal("tt.keyphrase.CARRIES_COLOR"));
         }
-        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add(translateToLocal("tt.keyword.MASS") + " = " + getMass() + " eV/c\u00b2");
         }
-        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(translateToLocal("tt.keyphrase.LIFE_TIME") + " = " + getRawTimeSpan(energyLevel) + " s");
             lines.add("    " + translateToLocal("tt.keyphrase.At_current_energy_level"));
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
index a61490b162..bd25b05a0c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/anomaly/AnomalyHandler.java
@@ -8,7 +8,7 @@ import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
 import com.github.technus.tectech.mechanics.data.IChunkMetaDataHandler;
 import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.complex.EMAtomDefinition;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -33,8 +33,8 @@ import java.util.Map;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT;
 import static com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry.EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;
-import static com.github.technus.tectech.util.Util.crossProduct3D;
-import static com.github.technus.tectech.util.Util.normalize3D;
+import static com.github.technus.tectech.util.TT_Utility.crossProduct3D;
+import static com.github.technus.tectech.util.TT_Utility.normalize3D;
 
 public class AnomalyHandler implements IChunkMetaDataHandler {
     private static final double SWAP_THRESHOLD = EMAtomDefinition.getSomethingHeavy().getMass() * 1000D * EM_COUNT_PER_MATERIAL_AMOUNT_DIMINISHED;//can be const as it is computed later...
@@ -171,8 +171,8 @@ public class AnomalyHandler implements IChunkMetaDataHandler {
         }
         int                    x  = (b.xPosition - a.xPosition) << 4;
         int                    z  = (b.xPosition - a.xPosition) << 4;
-        List<EntityLivingBase> aE = a.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(a));
-        List<EntityLivingBase> bE = b.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, Util.fromChunk(b));
+        List<EntityLivingBase> aE = a.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, TT_Utility.fromChunk(a));
+        List<EntityLivingBase> bE = b.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, TT_Utility.fromChunk(b));
         for (EntityLivingBase entityLivingBase : aE) {
             if (TecTech.RANDOM.nextBoolean()) {
                 if (entityLivingBase instanceof EntityPlayer) {
diff --git a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java
index 5885226f6f..ff515ab7d3 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertFloat.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.commands;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
@@ -25,7 +25,7 @@ public class ConvertFloat implements ICommand {
                     float value=Float.parseFloat(args[0]);
                     sender.addChatMessage(new ChatComponentText(
                             EnumChatFormatting.AQUA.toString()+ EnumChatFormatting.BOLD +
-                                    Util.intBitsToShortString(Float.floatToIntBits(value))+" "+
+                                    TT_Utility.intBitsToShortString(Float.floatToIntBits(value))+" "+
                                     EnumChatFormatting.RESET+EnumChatFormatting.BLUE +value));
                 }catch (Exception e){
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"Invalid Float "+args[0]));
diff --git a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java
index 41edd66684..37651e7478 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/commands/ConvertInteger.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.commands;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
@@ -25,7 +25,7 @@ public class ConvertInteger implements ICommand {
                     int value=Integer.parseInt(args[0]);
                     sender.addChatMessage(new ChatComponentText(
                             EnumChatFormatting.AQUA.toString()+ EnumChatFormatting.BOLD +
-                                    Util.intBitsToShortString(value)+" "+
+                                    TT_Utility.intBitsToShortString(value)+" "+
                                     EnumChatFormatting.RESET+EnumChatFormatting.BLUE +value));
                 }catch (Exception e){
                     sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"Invalid Integer "+args[0]));
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java
index 6094d08ba4..216c4057ef 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/ChunkDataMessage.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.mechanics.data;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
@@ -80,7 +80,7 @@ public class ChunkDataMessage implements IMessage {
     public static class ClientHandler extends AbstractClientMessageHandler<ChunkDataData> {
         @Override
         public IMessage handleClientMessage(EntityPlayer pPlayer, ChunkDataData pMessage, MessageContext pCtx) {
-            if(Util.checkChunkExist(pPlayer.worldObj,pMessage.chunk)){
+            if(TT_Utility.checkChunkExist(pPlayer.worldObj,pMessage.chunk)){
                 TecTech.chunkDataHandler.putChunkData(pMessage.handler, pMessage.worldId,pMessage.chunk, pMessage.data);
             }
             return null;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java
index f69bccc871..beda03fe0a 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/PlayerPersistence.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.mechanics.data;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent;
@@ -32,7 +32,7 @@ public class PlayerPersistence {
         if(tag!=null){
             return tag;
         }
-        tag=Util.getPlayerData(uuid1,uuid2,extension);
+        tag= TT_Utility.getPlayerData(uuid1,uuid2,extension);
         if(tag==null){
             tag=new NBTTagCompound();
         }
@@ -58,7 +58,7 @@ public class PlayerPersistence {
     }
 
     public void saveData(EntityPlayer player){
-        Util.savePlayerFile(player,extension,getDataOrSetToNewTag(player));
+        TT_Utility.savePlayerFile(player,extension,getDataOrSetToNewTag(player));
     }
 
     @SubscribeEvent
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
index fe542abbde..0f71a24d82 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/commands/EMList.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.mechanics.elementalMatter.core.commands;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMType;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import net.minecraft.command.ICommand;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
@@ -28,7 +28,7 @@ public class EMList implements ICommand {
             if(args.length == 0) {
                 listClasses(sender);
             }else {
-                String concated = Util.getConcated(args, " ");
+                String concated = TT_Utility.getConcated(args, " ");
                 listDefinitions(sender,concated, concated.replaceAll(" ","_"),concated.replaceAll("_"," "));
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
index a1f606c3c2..edf1827a07 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/definitions/EMPrimitiveTemplate.java
@@ -9,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import java.util.ArrayList;
 
 import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_scanner.*;
-import static com.github.technus.tectech.util.Util.areBitsSet;
+import static com.github.technus.tectech.util.TT_Utility.areBitsSet;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
index 265d219168..bfaad77c33 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMInstanceStackMap.java
@@ -7,6 +7,8 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.reg
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefinitionStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.IEMStack;
+import com.github.technus.tectech.util.TT_Utility;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
@@ -94,9 +96,9 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         for (EMInstanceStack instance : getBackingMap().values()) {
             info[i++] = EnumChatFormatting.BLUE + instance.getDefinition().getLocalizedName()+
                     " "+ EnumChatFormatting.AQUA + instance.getDefinition().getSymbol()+ EnumChatFormatting.RESET+
-                    " #: " + EnumChatFormatting.GREEN + String.format("%.3E", instance.getAmount() /AVOGADRO_CONSTANT) +" "+translateToLocal("tt.keyword.mol")+ EnumChatFormatting.RESET+
-                    " E: " + EnumChatFormatting.GREEN + instance.getEnergy() + EnumChatFormatting.RESET+
-                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?"STABLE":String.format("%.3E",instance.getLifeTime()));
+                    " #: " + EnumChatFormatting.GREEN + TT_Utility.formatNumberExp(instance.getAmount() /AVOGADRO_CONSTANT) +" "+translateToLocal("tt.keyword.mol")+ EnumChatFormatting.RESET+
+                    " E: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(instance.getEnergy()) + EnumChatFormatting.RESET+
+                    " T: " + EnumChatFormatting.GREEN + (instance.getLifeTime()<0?translateToLocal("tt.keyword.stable"):TT_Utility.formatNumberShortExp(instance.getLifeTime()));
         }
         return info;
     }
@@ -165,17 +167,6 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return new EMInstanceStackMap(false, instances);
     }
 
-    @Override
-    public boolean equals(Object obj) {
-        if (obj instanceof EMInstanceStackMap) {
-            return compareTo((EMInstanceStackMap) obj) == 0;
-        }
-        if (obj instanceof EMStackMap) {
-            return toDefinitionMapForComparison().compareTo((EMStackMap<?>) obj) == 0;
-        }
-        return false;
-    }
-
     @Override
     public String toString() {
         StringBuilder build=new StringBuilder("Instance Stack Map\n");
@@ -197,6 +188,7 @@ public final class EMInstanceStackMap extends EMStackMap<EMInstanceStack> implem
         return newStack;
     }
 
+    @Deprecated
     public EMDefinitionStackMap toDefinitionMapForComparison() {
         EMDefinitionStack[] list = new EMDefinitionStack[size()];
         int                 i    = 0;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
index 795ac3d3bf..3765fe6098 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/EMStackMap.java
@@ -30,11 +30,11 @@ abstract class EMStackMap<T extends IEMStack> implements IEMMapRead<T> {
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof EMInstanceStackMap) {
-            return compareTo(((EMInstanceStackMap) obj).toDefinitionMapForComparison()) == 0;
+        if(this == obj){
+            return true;
         }
-        if (obj instanceof EMStackMap) {
-            return compareTo((EMStackMap) obj) == 0;
+        if (obj instanceof IEMMapRead) {
+            return compareTo((IEMMapRead<? extends IEMStack>) obj) == 0;
         }
         return false;
     }
@@ -47,4 +47,9 @@ abstract class EMStackMap<T extends IEMStack> implements IEMMapRead<T> {
         }
         return hash;
     }
+
+    @Override
+    public int compareTo(IEMMapRead<? extends IEMStack> o) {
+        return IEMMapRead.super.compareTo(o);
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
index c0420fa2b2..86ca6de8a8 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/maps/IEMMapRead.java
@@ -14,7 +14,7 @@ import static com.github.technus.tectech.mechanics.elementalMatter.core.transfor
 import static com.github.technus.tectech.util.DoubleCount.ulpSigned;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
-public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<?>>, Cloneable {
+public interface IEMMapRead<T extends IEMStack> extends Comparable<IEMMapRead<? extends IEMStack>>, Cloneable {
     NavigableMap<IEMDefinition,T> getBackingMap();
 
     IEMMapRead<T> clone();
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
index b67d2ce121..d37a8bd099 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/core/stacks/EMInstanceStack.java
@@ -7,7 +7,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEM
 import com.github.technus.tectech.mechanics.elementalMatter.core.definitions.registry.EMDefinitionsRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstanceStackMap;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import net.minecraft.client.Minecraft;
 import net.minecraft.crash.CrashReport;
 import net.minecraft.nbt.NBTTagCompound;
@@ -505,26 +505,26 @@ public final class EMInstanceStack implements IEMStack {
 
     public void addScanResults(ArrayList<String> lines, int[] detailsOnDepthLevels) {
         int capabilities = detailsOnDepthLevels[0];
-        if (Util.areBitsSet(SCAN_GET_DEPTH_LEVEL, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_DEPTH_LEVEL, capabilities)) {
             lines.add("DEPTH = " + 0);
         }
         getDefinition().addScanResults(lines, capabilities, energy);
-        if (Util.areBitsSet(SCAN_GET_TIMESPAN_MULT, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_TIMESPAN_MULT, capabilities)) {
             lines.add("TIME MULT = " + lifeTimeMult);
-            if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+            if (TT_Utility.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
                 lines.add("TIME SPAN = " + lifeTime + " s");
             }
         }
-        if (Util.areBitsSet(SCAN_GET_AGE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_AGE, capabilities)) {
             lines.add("AGE = " + getAge() + " s");
         }
-        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_COLOR, capabilities)) {
             lines.add("COLOR = " + color + " RGB or CMY");
         }
-        if (Util.areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_ENERGY_LEVEL, capabilities)) {
             lines.add("ENERGY = " + energy);
         }
-        if (Util.areBitsSet(SCAN_GET_AMOUNT, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_AMOUNT, capabilities)) {
             lines.add("AMOUNT = " + getAmount() /AVOGADRO_CONSTANT + " "+translateToLocal("tt.keyword.mol"));
         }
         scanContents(lines, getDefinition().getSubParticles(), 1, detailsOnDepthLevels);
@@ -535,11 +535,11 @@ public final class EMInstanceStack implements IEMStack {
             int deeper = depth + 1;
             for (EMDefinitionStack definitionStack : definitions.valuesToArray()) {
                 lines.add("");//def separator
-                if (Util.areBitsSet(SCAN_GET_DEPTH_LEVEL, detailsOnDepthLevels[depth])) {
+                if (TT_Utility.areBitsSet(SCAN_GET_DEPTH_LEVEL, detailsOnDepthLevels[depth])) {
                     lines.add("DEPTH = " + depth);
                 }
                 getDefinition().addScanResults(lines, detailsOnDepthLevels[depth], energy);
-                if (Util.areBitsSet(SCAN_GET_AMOUNT, detailsOnDepthLevels[depth])) {
+                if (TT_Utility.areBitsSet(SCAN_GET_AMOUNT, detailsOnDepthLevels[depth])) {
                     lines.add("AMOUNT = " + definitionStack.getAmount());
                 }
                 scanContents(lines, definitionStack.getDefinition().getSubParticles(), deeper, detailsOnDepthLevels);
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
index 0eced7bd3c..20e58216c1 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMAtomDefinition.java
@@ -14,7 +14,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.transformations
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMGaugeBosonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMLeptonDefinition;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMNeutrinoDefinition;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.util.XSTR;
 
 import java.util.*;
@@ -1676,35 +1676,35 @@ public class EMAtomDefinition extends EMComplexTemplate {
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
             lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = " + getLocalizedName());
             lines.add("SYMBOL = " + getSymbol());
         }
-        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
-        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_COLOR, capabilities)) {
             lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
-        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
         }
-        if (iaeaDefinitionExistsAndHasEnergyLevels && Util.areBitsSet(SCAN_GET_ENERGY_STATES, capabilities)) {
+        if (iaeaDefinitionExistsAndHasEnergyLevels && TT_Utility.areBitsSet(SCAN_GET_ENERGY_STATES, capabilities)) {
             for (int i = 1; i < getIaea().getEnergeticStatesArray().length; i++) {
                 lines.add("E LEVEL " + i + " = " + getIaea().getEnergeticStatesArray()[i].energy + " eV");
             }
         }
-        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("HALF LIFE = " + getRawTimeSpan(energyLevel) + " s");
             lines.add("    At current energy level");
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
index 19208fbf4a..85cb07ea33 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMHadronDefinition.java
@@ -15,7 +15,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.transformations
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.EMTransformationRegistry;
 import com.github.technus.tectech.mechanics.elementalMatter.core.transformations.OreDictionaryStack;
 import com.github.technus.tectech.mechanics.elementalMatter.definitions.primitive.EMQuarkDefinition;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import net.minecraftforge.oredict.OreDictionary;
@@ -461,30 +461,30 @@ public class EMHadronDefinition extends EMComplexTemplate {//TODO Optimize map i
 
     @Override
     public void addScanShortSymbols(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add(getShortSymbol());
         }
     }
 
     @Override
     public void addScanResults(ArrayList<String> lines, int capabilities, long energyLevel) {
-        if (Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) {
             lines.add("CLASS = " + getIndirectTagValue() + ' ' + getMatterMassType());
         }
-        if (Util.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_NOMENCLATURE | SCAN_GET_CHARGE | SCAN_GET_MASS | SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("NAME = " + getLocalizedTypeName());
             //lines.add("SYMBOL = "+getSymbol());
         }
-        if (Util.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_CHARGE, capabilities)) {
             lines.add("CHARGE = " + getCharge() / 3D + " e");
         }
-        if (Util.areBitsSet(SCAN_GET_COLOR, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_COLOR, capabilities)) {
             lines.add(hasColor() ? "COLORLESS" : "CARRIES COLOR");
         }
-        if (Util.areBitsSet(SCAN_GET_MASS, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_MASS, capabilities)) {
             lines.add("MASS = " + getMass() + " eV/c\u00b2");
         }
-        if (Util.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
+        if (TT_Utility.areBitsSet(SCAN_GET_TIMESPAN_INFO, capabilities)) {
             lines.add("HALF LIFE = " + getRawTimeSpan(energyLevel) + " s");
             lines.add("    " + "At current energy level");
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
index bd34733cb6..e5fab5e6bf 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/elementalMatter/definitions/complex/EMNuclideIAEA.java
@@ -8,7 +8,7 @@ import java.util.HashSet;
 import java.util.TreeMap;
 
 import static com.github.technus.tectech.mechanics.elementalMatter.core.definitions.IEMDefinition.STABLE_RAW_LIFE_TIME;
-import static com.github.technus.tectech.util.Util.splitButDifferent;
+import static com.github.technus.tectech.util.TT_Utility.splitButDifferent;
 
 public final class EMNuclideIAEA {
     public static final double AMU_TO_EV_DIV_C_C=9.31494061E08D,MICRO_AMU_TO_EV_DIV_C_C=9.31494061E02D;
diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java
index 114dc7399f..85e9fa26ec 100644
--- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java
+++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java
@@ -215,8 +215,8 @@ public class TT_NEI_ResearchHandler extends TemplateRecipeHandler {
             int tSpecial = ((CachedDefaultRecipe) arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;
             short ampere=(short) (tSpecial & 0xFFFF),minComputationPerSec=(short)(tSpecial>>>16);
 			if (tEUt != 0) {
-                drawText(10, 73, trans("152","Max Total: ") + GT_Utility.formatNumbers((1+ (computation-minComputationPerSec) /minComputationPerSec) * (long)tEUt * ampere * 20) + " EU", -16777216);
-                drawText(10, 83, trans("153","Usage: ") + GT_Utility.formatNumbers((long)tEUt*ampere) + " EU/t", -16777216);
+                drawText(10, 73, trans("152","Max Total: ") + GT_Utility.formatNumbers((1 + (computation - minComputationPerSec) / minComputationPerSec) * (long) tEUt * ampere * 20) + " EU", -16777216);
+                drawText(10, 83, trans("153","Usage: ") + GT_Utility.formatNumbers((long) tEUt * ampere) + " EU/t", -16777216);
 				if (mRecipeMap.mShowVoltageAmperageInNEI) {
                     drawText(10, 93, trans("154","Voltage: ") + GT_Utility.formatNumbers(tEUt) + " EU", -16777216);
                     drawText(10, 103, trans("155","Amperage: ") + GT_Utility.formatNumbers(ampere), -16777216);
diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java
index 2dc4604fd5..50035be554 100644
--- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java
+++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java
@@ -215,8 +215,8 @@ public class TT_NEI_ScannerHandler extends TemplateRecipeHandler {
             int tSpecial = ((CachedDefaultRecipe) arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;
             short ampere=(short) (tSpecial & 0xFFFF),minComputationPerSec=(short)(tSpecial>>>16);
 			if (tEUt != 0) {
-                drawText(10, 73, trans("152","Max Total: ") + GT_Utility.formatNumbers((1+ (computation-minComputationPerSec) /minComputationPerSec) * (long)tEUt * ampere * 20) + " EU", -16777216);
-                drawText(10, 83, trans("153","Usage: ") + GT_Utility.formatNumbers((long)tEUt*ampere) + " EU/t", -16777216);
+                drawText(10, 73, trans("152","Max Total: ") + GT_Utility.formatNumbers((1 + (computation - minComputationPerSec) / minComputationPerSec) * (long) tEUt * ampere * 20) + " EU", -16777216);
+                drawText(10, 83, trans("153","Usage: ") + GT_Utility.formatNumbers((long) tEUt * ampere) + " EU/t", -16777216);
 				if (mRecipeMap.mShowVoltageAmperageInNEI) {
                     drawText(10, 93, trans("154","Voltage: ") + GT_Utility.formatNumbers(tEUt) + " EU", -16777216);
                     drawText(10, 103, trans("155","Amperage: ") + GT_Utility.formatNumbers(ampere), -16777216);
diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
index d6b5e28b18..7266611b20 100644
--- a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
+++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_EnderFluidLink.java
@@ -3,6 +3,7 @@ package com.github.technus.tectech.thing.cover;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.enderStorage.EnderLinkCoverMessage;
 import com.github.technus.tectech.mechanics.enderStorage.EnderLinkTag;
+import com.github.technus.tectech.util.TT_Utility;
 import eu.usrv.yamcore.auxiliary.PlayerChatHelper;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.GT_GUICover;
@@ -325,7 +326,7 @@ public class GT_Cover_TM_EnderFluidLink extends GT_CoverBehavior {
         @Override
         public void resetTextBox(GT_GuiIntegerTextBox box) {
             //Solid White becomes: #FFFFFFFF
-            box.setText("#" + String.format("%08X", tag.getColorInt()));
+            box.setText("#" + TT_Utility.formatNumberIntHex(tag.getColorInt()));
         }
 
         public void resetColorField() {
diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
index b8ce40b180..7d7880adca 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java
@@ -9,7 +9,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -120,7 +120,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
             NBTTagCompound tNBT = aStack.getTagCompound();
             if (tNBT != null && tNBT.hasKey("info")) {
                 aList.add(translateToLocal("item.em.debugContainer.desc.0") + ": ");//Contains
-                Collections.addAll(aList, Util.infoFromNBT(tNBT.getCompoundTag("info")));
+                Collections.addAll(aList, TT_Utility.infoFromNBT(tNBT.getCompoundTag("info")));
             } else {
                 aList.add(translateToLocal("item.em.debugContainer.desc.1"));//Container for elemental matter
                 aList.add(EnumChatFormatting.BLUE + translateToLocal("item.em.debugContainer.desc.2"));//Right click on elemental hatches
@@ -155,7 +155,7 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE
         try {
             NBTTagCompound tNBT = aStack.getTagCompound();
             if (tNBT != null && tNBT.hasKey("symbols")) {
-                String[] strings=Util.infoFromNBT(tNBT.getCompoundTag("symbols"));
+                String[] strings= TT_Utility.infoFromNBT(tNBT.getCompoundTag("symbols"));
                 return strings[index%strings.length];
             } else {
                 return null;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
index 0de8bb007a..dede2e36ce 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java
@@ -6,7 +6,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMConstantStackMap;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.gui.FontRenderer;
@@ -114,7 +114,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
             NBTTagCompound tNBT = aStack.getTagCompound();
             if (tNBT != null && tNBT.hasKey("info")) {
                 aList.add(translateToLocal("item.em.definitionContainer.desc.0") + ": ");//Should Contain
-                Collections.addAll(aList, Util.infoFromNBT(tNBT.getCompoundTag("info")));
+                Collections.addAll(aList, TT_Utility.infoFromNBT(tNBT.getCompoundTag("info")));
             } else {
                 aList.add(translateToLocal("item.em.definitionContainer.desc.1"));//Recipe Hint
             }
@@ -140,7 +140,7 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem
         try {
             NBTTagCompound tNBT = aStack.getTagCompound();
             if (tNBT != null && tNBT.hasKey("symbols")) {
-                String[] strings=Util.infoFromNBT(tNBT.getCompoundTag("symbols"));
+                String[] strings= TT_Utility.infoFromNBT(tNBT.getCompoundTag("symbols"));
                 return strings[index%strings.length];
             } else {
                 return null;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index 1cb6de1df6..22fc6e65a9 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -7,7 +7,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.item.renderElemental.IElementalItem;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -65,7 +65,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item implements IEl
 
     public static String[] getLines(ItemStack containerItem){
         if(containerItem.stackTagCompound!=null && containerItem.stackTagCompound.hasKey("elementalInfo")) {
-            return Util.infoFromNBT(containerItem.stackTagCompound.getCompoundTag("elementalInfo"));
+            return TT_Utility.infoFromNBT(containerItem.stackTagCompound.getCompoundTag("elementalInfo"));
         }
         return null;
     }
@@ -142,7 +142,7 @@ public final class ElementalDefinitionScanStorage_EM extends Item implements IEl
         try {
             NBTTagCompound tNBT = aStack.getTagCompound();
             if (tNBT != null && tNBT.hasKey("symbols")) {
-                String[] strings=Util.infoFromNBT(tNBT.getCompoundTag("symbols"));
+                String[] strings= TT_Utility.infoFromNBT(tNBT.getCompoundTag("symbols"));
                 return strings[index%strings.length];
             } else {
                 return null;
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
index 7f9e0f0a4a..aff84c9b4b 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ParametrizerMemoryCard.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.item;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_ParamText;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
@@ -146,13 +146,13 @@ public final class ParametrizerMemoryCard extends Item {
             aList.add("Hatch ID: "+EnumChatFormatting.AQUA + tNBT.getInteger("param"));
             temp=tNBT.getInteger("value0D");
             aList.add("Value 0D: "+EnumChatFormatting.AQUA + temp);
-            aList.add("Value 0B: "+EnumChatFormatting.AQUA + Util.longBitsToShortString(Double.doubleToLongBits(temp)));
+            aList.add("Value 0B: "+EnumChatFormatting.AQUA + TT_Utility.longBitsToShortString(Double.doubleToLongBits(temp)));
             if(tNBT.hasKey("value0s")) {
                 aList.add("Value 0s: " + EnumChatFormatting.AQUA + tNBT.getString("value0s"));
             }
             temp=tNBT.getInteger("value1D");
             aList.add("Value 1D: "+EnumChatFormatting.AQUA + temp);
-            aList.add("Value 1B: "+EnumChatFormatting.AQUA + Util.longBitsToShortString(Double.doubleToLongBits(temp)));
+            aList.add("Value 1B: "+EnumChatFormatting.AQUA + TT_Utility.longBitsToShortString(Double.doubleToLongBits(temp)));
             if(tNBT.hasKey("value1s")) {
                 aList.add("Value 1s: " + EnumChatFormatting.AQUA + tNBT.getString("value1s"));
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
index 4e07622c25..1e90535224 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Capacitor;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Capacitor;
 import cpw.mods.fml.relauncher.Side;
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.github.technus.tectech.util.Util.getUniqueIdentifier;
+import static com.github.technus.tectech.util.TT_Utility.getUniqueIdentifier;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -38,7 +38,7 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch {
 
     public GT_MetaTileEntity_Hatch_Capacitor(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 16, "");
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_Hatch_Capacitor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java
index 815f8006c4..eb9ce2af30 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe;
@@ -22,7 +22,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatch_DataConnector<QuantumDataPacket> {
     public GT_MetaTileEntity_Hatch_CreativeData(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_CreativeData(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java
index 42817f473e..5279da2b00 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeMaintenance.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -22,7 +22,7 @@ public class GT_MetaTileEntity_Hatch_CreativeMaintenance extends GT_MetaTileEnti
 
     public GT_MetaTileEntity_Hatch_CreativeMaintenance(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_CreativeMaintenance(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
index 4aa90339cc..3385447861 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.mechanics.dataTransport.DataPacket;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe;
 import cpw.mods.fml.relauncher.Side;
@@ -41,7 +41,7 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket
 
     protected GT_MetaTileEntity_Hatch_DataConnector(int aID, String aName, String aNameRegional, int aTier, String descr) {
         super(aID, aName, aNameRegional, aTier, 0, descr);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     protected GT_MetaTileEntity_Hatch_DataConnector(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
index bbc11f10fe..026ba46882 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -22,7 +22,7 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch
     public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
         super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0"));//Multiple Ampere Energy Extractor for Multiblocks
         Amperes = aAmp;
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
index b015d71b60..c247121e0e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel;
 import gregtech.api.interfaces.ITexture;
@@ -24,7 +24,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatch_DynamoMulti implements IConnectsToEnergyTunnel {
     public GT_MetaTileEntity_Hatch_DynamoTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
         super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"), aAmp);//Energy extracting terminal for Multiblocks
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index 6cb83f5d46..a6806ddb2f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.maps.EMInstance
 import com.github.technus.tectech.mechanics.elementalMatter.core.IEMContainer;
 import com.github.technus.tectech.mechanics.elementalMatter.core.EMException;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToElementalPipe;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Dyes;
@@ -14,6 +14,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_Utility;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -50,7 +51,7 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
 
     protected GT_MetaTileEntity_Hatch_ElementalContainer(int aID, String aName, String aNameRegional, int aTier, String descr) {
         super(aID, aName, aNameRegional, aTier, 0, descr);
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     protected GT_MetaTileEntity_Hatch_ElementalContainer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
@@ -281,8 +282,8 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
         return new String[]{
                 TEC_MARK_EM,
                 mDescription,
-                translateToLocal("tt.base.emhatch.desc.0") + " " + EnumChatFormatting.AQUA + getMaxStacksCount(),//Max stacks amount:
-                translateToLocal("tt.base.emhatch.desc.1") + " " + EnumChatFormatting.AQUA + getMaxStackSize(),//Stack capacity:
+                translateToLocal("tt.base.emhatch.desc.0") + " " + EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getMaxStacksCount()),//Max stacks amount:
+                translateToLocal("tt.base.emhatch.desc.1") + " " + EnumChatFormatting.AQUA + TT_Utility.formatNumberShortExp(getMaxStackSize()),//Stack capacity:
                 translateToLocal("tt.base.emhatch.desc.2"),//Place Overflow Hatch behind,on top or below
                 translateToLocal("tt.base.emhatch.desc.3"),//to provide overflow protection while this block
                 translateToLocal("tt.base.emhatch.desc.4"),//is not attached to multi block.
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
index 0acb9849a7..c637b3bfee 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -11,8 +11,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
+import static com.github.technus.tectech.util.CommonValues.V;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -24,7 +24,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch
     public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
         super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"));//Multiple Ampere Energy Injector for Multiblocks
         Amperes = aAmp;
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
index d44119e1ab..d29f9fc14b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
@@ -1,8 +1,8 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel;
+import com.github.technus.tectech.util.CommonValues;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -11,9 +11,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
+import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT;
 import static com.github.technus.tectech.util.CommonValues.TRANSFER_AT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
 /**
@@ -22,7 +22,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatch_EnergyMulti implements IConnectsToEnergyTunnel {
     public GT_MetaTileEntity_Hatch_EnergyTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
         super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.energytunnel.desc.0"), aAmp);//Energy injecting terminal for Multiblocks
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java
index 3bbd6b9d54..96dc4261dd 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Holder;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Holder;
 import cpw.mods.fml.relauncher.Side;
@@ -29,7 +29,7 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch {
 
     public GT_MetaTileEntity_Hatch_Holder(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_Holder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java
index 386a08b790..183758b756 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe;
 import gregtech.api.interfaces.ITexture;
@@ -20,7 +20,7 @@ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_D
 
     public GT_MetaTileEntity_Hatch_InputData(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_InputData(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java
index f270971f4d..187fa1f631 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.mechanics.dataTransport.InventoryDataPacket;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe;
 import gregtech.api.enums.Dyes;
@@ -35,7 +35,7 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha
 
     public GT_MetaTileEntity_Hatch_InputDataItems(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_InputDataItems(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java
index b0f71aab24..92e70e62d5 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -13,7 +13,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_Hatch_InputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer {
     public GT_MetaTileEntity_Hatch_InputElemental(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emin.desc"));//Elemental Input for Multiblocks
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     //public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java
index 87a9c93785..55cbf24d04 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.mechanics.dataTransport.QuantumDataPacket;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe;
@@ -21,7 +21,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_DataConnector<QuantumDataPacket> {
     public GT_MetaTileEntity_Hatch_OutputData(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_OutputData(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java
index 385de4343c..5fe3fd3170 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.mechanics.dataTransport.InventoryDataPacket;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data;
 import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe;
@@ -21,7 +21,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_Hatch_OutputDataItems extends GT_MetaTileEntity_Hatch_DataConnector<InventoryDataPacket> {
     public GT_MetaTileEntity_Hatch_OutputDataItems(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_OutputDataItems(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
index 1426e8a702..4b62965dba 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -16,7 +16,7 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer {
     public GT_MetaTileEntity_Hatch_OutputElemental(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emout.desc"));//Elemental Output for Multiblocks
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     //public GT_MetaTileEntity_Hatch_OutputElemental(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
index 8b55c16831..5223ca5b5b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Dyes;
@@ -12,7 +12,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_Utility;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -54,7 +53,7 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
         overflowMatter = max / 2;
         overflowMax = max;
         overflowDisperse = overflowMax / (float) (30 - aTier);
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_Hatch_OverflowElemental(String aName, int aTier, double max, String aDescription, ITexture[][][] aTextures) {
@@ -89,8 +88,8 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
         return new String[]{
                 CommonValues.TEC_MARK_EM,
                 mDescription,
-                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + EnumChatFormatting.AQUA + GT_Utility.formatNumbers(overflowMax) + " eV/c\u00b2",
-                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + EnumChatFormatting.AQUA + GT_Utility.formatNumbers(overflowDisperse) + " (eV/c\u00b2)/s",
+                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + EnumChatFormatting.AQUA + TT_Utility.formatNumberShortExp(overflowMax) + " eV/c\u00b2",
+                translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + EnumChatFormatting.AQUA + TT_Utility.formatNumberShortExp(overflowDisperse) + " (eV/c\u00b2)/s",
                 translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3")
         };
     }
@@ -218,10 +217,10 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity
     public String[] getInfoData() {
         return new String[]{
                 translateToLocalFormatted("tt.keyphrase.Contained_mass", clientLocale) + ":",
-                EnumChatFormatting.RED + GT_Utility.formatNumbers(overflowMatter) + EnumChatFormatting.RESET + " eV/c\u00b2 /",
-                EnumChatFormatting.GREEN + GT_Utility.formatNumbers(overflowMax) + EnumChatFormatting.RESET + " eV/c\u00b2",
+                EnumChatFormatting.RED + TT_Utility.formatNumberExp(overflowMatter) + EnumChatFormatting.RESET + " eV/c\u00b2 /",
+                EnumChatFormatting.GREEN + TT_Utility.formatNumberShortExp(overflowMax) + EnumChatFormatting.RESET + " eV/c\u00b2",
                 translateToLocalFormatted("tt.keyphrase.Mass_Disposal_speed", clientLocale) + ": " +
-                        EnumChatFormatting.BLUE + GT_Utility.formatNumbers(overflowDisperse) + EnumChatFormatting.RESET + " (eV/c\u00b2)/s"
+                        EnumChatFormatting.BLUE + TT_Utility.formatNumberShortExp(overflowDisperse) + EnumChatFormatting.RESET + " (eV/c\u00b2)/s"
         };
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
index 7b8a488e57..10e6ca71d9 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Param;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_ParamAdv;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Param;
@@ -44,7 +44,7 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch {
 
     public GT_MetaTileEntity_Hatch_Param(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_Param(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
index 53fea9ef7c..975d6b516b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java
@@ -3,7 +3,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch;
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.Reference;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Rack;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Rack;
 import cpw.mods.fml.common.Loader;
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT;
-import static com.github.technus.tectech.util.Util.getUniqueIdentifier;
+import static com.github.technus.tectech.util.TT_Utility.getUniqueIdentifier;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static net.minecraft.util.StatCollector.translateToLocal;
 import static net.minecraft.util.StatCollector.translateToLocalFormatted;
@@ -48,7 +48,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch {
 
     public GT_MetaTileEntity_Hatch_Rack(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 4, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_Hatch_Rack(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java
index d723dd908c..00c1d002b6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_Container_Uncertainty;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_Uncertainty;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_UncertaintyAdv;
@@ -40,7 +40,7 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch
 
     public GT_MetaTileEntity_Hatch_Uncertainty(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
         regenerate();
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/TextParametersMessage.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/TextParametersMessage.java
index b0b53f6c79..96b54273db 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/TextParametersMessage.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/TextParametersMessage.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch;
 
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.gui.GT_GUIContainer_ParamText;
 import cpw.mods.fml.common.network.ByteBufUtils;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
@@ -149,8 +149,8 @@ public class TextParametersMessage implements IMessage {
                     if(meta instanceof GT_MetaTileEntity_Hatch_ParamText){
                         ((GT_MetaTileEntity_Hatch_ParamText) meta).value0s =pMessage.mVal0;
                         ((GT_MetaTileEntity_Hatch_ParamText) meta).value1s =pMessage.mVal1;
-                        ((GT_MetaTileEntity_Hatch_ParamText) meta).value0D=Util.getValue(pMessage.mVal0);
-                        ((GT_MetaTileEntity_Hatch_ParamText) meta).value1D=Util.getValue(pMessage.mVal1);
+                        ((GT_MetaTileEntity_Hatch_ParamText) meta).value0D= TT_Utility.getValue(pMessage.mVal0);
+                        ((GT_MetaTileEntity_Hatch_ParamText) meta).value1D= TT_Utility.getValue(pMessage.mVal1);
                     }
                 }
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
index da067078c9..cf3a164f8f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -144,11 +144,11 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
 
         for (Object crafter : crafters) {
             ICrafting var1 = (ICrafting) crafter;
-            Util.sendInteger(param,this,var1,100);
-            Util.sendDouble(value0d,this,var1,102);
-            Util.sendDouble(value1d,this,var1, 106);
-            Util.sendDouble(input0d,this,var1, 110);
-            Util.sendDouble(input1d,this,var1, 114);
+            TT_Utility.sendInteger(param,this,var1,100);
+            TT_Utility.sendDouble(value0d,this,var1,102);
+            TT_Utility.sendDouble(value1d,this,var1, 106);
+            TT_Utility.sendDouble(input0d,this,var1, 110);
+            TT_Utility.sendDouble(input1d,this,var1, 114);
         }
     }
 
@@ -159,31 +159,31 @@ public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
         switch (par1) {
             case 100:
             case 101:
-                param=Util.receiveInteger(param,100,par1,par2);
+                param= TT_Utility.receiveInteger(param,100,par1,par2);
                 return;
             case 102:
             case 103:
             case 104:
             case 105:
-                value0d =Double.longBitsToDouble(value0l=Util.receiveLong(value0l,102,par1,par2));
+                value0d =Double.longBitsToDouble(value0l= TT_Utility.receiveLong(value0l,102,par1,par2));
                 return;
             case 106:
             case 107:
             case 108:
             case 109:
-                value1d =Double.longBitsToDouble(value1l=Util.receiveLong(value1l,106,par1,par2));
+                value1d =Double.longBitsToDouble(value1l= TT_Utility.receiveLong(value1l,106,par1,par2));
                 return;
             case 110:
             case 111:
             case 112:
             case 113:
-                input0d =Double.longBitsToDouble(input0l=Util.receiveLong(input0l,110,par1,par2));
+                input0d =Double.longBitsToDouble(input0l= TT_Utility.receiveLong(input0l,110,par1,par2));
                 return;
             case 114:
             case 115:
             case 116:
             case 117:
-                input1d =Double.longBitsToDouble(input1l=Util.receiveLong(input1l,114,par1,par2));
+                input1d =Double.longBitsToDouble(input1l= TT_Utility.receiveLong(input1l,114,par1,par2));
                 return;
             default:
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java
index c8fa85996a..75abd6d4c2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamAdv.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -231,12 +231,12 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
 
         for (Object crafter : crafters) {
             ICrafting var1 = (ICrafting) crafter;
-            Util.sendInteger(param,this,var1,100);
-            Util.sendDouble(value0d,this,var1,102);
-            Util.sendDouble(value1d,this,var1, 106);
-            Util.sendDouble(input0d,this,var1, 110);
-            Util.sendDouble(input1d,this,var1, 114);
-            Util.sendInteger(pointer,this,var1,118);
+            TT_Utility.sendInteger(param,this,var1,100);
+            TT_Utility.sendDouble(value0d,this,var1,102);
+            TT_Utility.sendDouble(value1d,this,var1, 106);
+            TT_Utility.sendDouble(input0d,this,var1, 110);
+            TT_Utility.sendDouble(input1d,this,var1, 114);
+            TT_Utility.sendInteger(pointer,this,var1,118);
         }
     }
 
@@ -247,35 +247,35 @@ public class GT_Container_ParamAdv extends GT_ContainerMetaTile_Machine {
         switch (par1) {
             case 100:
             case 101:
-                param=Util.receiveInteger(param,100,par1,par2);
+                param= TT_Utility.receiveInteger(param,100,par1,par2);
                 return;
             case 102:
             case 103:
             case 104:
             case 105:
-                value0d =Double.longBitsToDouble(value0l=Util.receiveLong(value0l,102,par1,par2));
+                value0d =Double.longBitsToDouble(value0l= TT_Utility.receiveLong(value0l,102,par1,par2));
                 return;
             case 106:
             case 107:
             case 108:
             case 109:
-                value1d =Double.longBitsToDouble(value1l=Util.receiveLong(value1l,106,par1,par2));
+                value1d =Double.longBitsToDouble(value1l= TT_Utility.receiveLong(value1l,106,par1,par2));
                 return;
             case 110:
             case 111:
             case 112:
             case 113:
-                input0d =Double.longBitsToDouble(input0l=Util.receiveLong(input0l,110,par1,par2));
+                input0d =Double.longBitsToDouble(input0l= TT_Utility.receiveLong(input0l,110,par1,par2));
                 return;
             case 114:
             case 115:
             case 116:
             case 117:
-                input1d =Double.longBitsToDouble(input1l=Util.receiveLong(input1l,114,par1,par2));
+                input1d =Double.longBitsToDouble(input1l= TT_Utility.receiveLong(input1l,114,par1,par2));
                 return;
             case 118:
             case 119:
-                pointer=Util.receiveInteger(pointer,118,par1,par2);
+                pointer= TT_Utility.receiveInteger(pointer,118,par1,par2);
                 return;
             default:
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java
index 9c0e08948f..1d2df027f3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_ParamText.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_ParamText;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.TextParametersMessage;
@@ -95,11 +95,11 @@ public class GT_Container_ParamText extends GT_ContainerMetaTile_Machine {
         input1d = ((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).input1D;
         for (Object crafter : crafters) {
             ICrafting var1 = (ICrafting) crafter;
-            Util.sendInteger(param,this,var1,100);
-            Util.sendDouble(value0d,this,var1,102);
-            Util.sendDouble(value1d,this,var1, 106);
-            Util.sendDouble(input0d,this,var1, 110);
-            Util.sendDouble(input1d,this,var1, 114);
+            TT_Utility.sendInteger(param,this,var1,100);
+            TT_Utility.sendDouble(value0d,this,var1,102);
+            TT_Utility.sendDouble(value1d,this,var1, 106);
+            TT_Utility.sendDouble(input0d,this,var1, 110);
+            TT_Utility.sendDouble(input1d,this,var1, 114);
         }
         if(!Objects.equals(value0s,((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value0s) ||
                 !Objects.equals(value0s,((GT_MetaTileEntity_Hatch_ParamText) mTileEntity.getMetaTileEntity()).value0s)){
@@ -123,31 +123,31 @@ public class GT_Container_ParamText extends GT_ContainerMetaTile_Machine {
         switch (par1) {
             case 100:
             case 101:
-                param=Util.receiveInteger(param,100,par1,par2);
+                param= TT_Utility.receiveInteger(param,100,par1,par2);
                 return;
             case 102:
             case 103:
             case 104:
             case 105:
-                value0d =Double.longBitsToDouble(value0l=Util.receiveLong(value0l,102,par1,par2));
+                value0d =Double.longBitsToDouble(value0l= TT_Utility.receiveLong(value0l,102,par1,par2));
                 return;
             case 106:
             case 107:
             case 108:
             case 109:
-                value1d =Double.longBitsToDouble(value1l=Util.receiveLong(value1l,106,par1,par2));
+                value1d =Double.longBitsToDouble(value1l= TT_Utility.receiveLong(value1l,106,par1,par2));
                 return;
             case 110:
             case 111:
             case 112:
             case 113:
-                input0d =Double.longBitsToDouble(input0l=Util.receiveLong(input0l,110,par1,par2));
+                input0d =Double.longBitsToDouble(input0l= TT_Utility.receiveLong(input0l,110,par1,par2));
                 return;
             case 114:
             case 115:
             case 116:
             case 117:
-                input1d =Double.longBitsToDouble(input1l=Util.receiveLong(input1l,114,par1,par2));
+                input1d =Double.longBitsToDouble(input1l= TT_Utility.receiveLong(input1l,114,par1,par2));
                 return;
             default:
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
index 7eb71651bb..686c2c81ce 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
@@ -1,14 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 import org.lwjgl.opengl.GL11;
 
-import java.util.Locale;
-
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 
 public class GT_GUIContainer_Param extends GT_GUIContainerMetaTile_Machine {
@@ -20,15 +18,14 @@ public class GT_GUIContainer_Param extends GT_GUIContainerMetaTile_Machine {
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         if (mContainer != null) {
             TecTechFontRender.INSTANCE.drawSplitString("Parameters: " + ((GT_Container_Param) mContainer).param, 46, 7, 167, 0xffffff);
-            Locale locale= Locale.getDefault();
-            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).input0d), 46, 16, 167, 0x22ddff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).input1d), 46, 24, 167, 0x00ffff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).value0d), 46, 33, 167, 0x00bbff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + String.format(locale, "%+.5E", ((GT_Container_Param) mContainer).value1d), 46, 41, 167, 0x0077ff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + TT_Utility.formatNumberExp(((GT_Container_Param) mContainer).input0d), 46, 16, 167, 0x22ddff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + TT_Utility.formatNumberExp(((GT_Container_Param) mContainer).input1d), 46, 24, 167, 0x00ffff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + TT_Utility.formatNumberExp(((GT_Container_Param) mContainer).value0d), 46, 33, 167, 0x00bbff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + TT_Utility.formatNumberExp(((GT_Container_Param) mContainer).value1d), 46, 41, 167, 0x0077ff);
             GL11.glPushMatrix();
             GL11.glScalef(.5f,.5f,.5f);
-            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value0d)), 92, 100, 334, 0x00bbff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value1d)), 92, 116, 334, 0x0077ff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + TT_Utility.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value0d)), 92, 100, 334, 0x00bbff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + TT_Utility.longBitsToShortString(Double.doubleToLongBits(((GT_Container_Param) mContainer).value1d)), 92, 116, 334, 0x0077ff);
             GL11.glPopMatrix();
         } else {
             TecTechFontRender.INSTANCE.drawSplitString("Parameters", 46, 7, 167, 0xffffff);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java
index 4346118619..f7ffa18ffc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamAdv.java
@@ -1,14 +1,12 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 import org.lwjgl.opengl.GL11;
 
-import java.util.Locale;
-
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 
 public class GT_GUIContainer_ParamAdv extends GT_GUIContainerMetaTile_Machine {
@@ -20,15 +18,14 @@ public class GT_GUIContainer_ParamAdv extends GT_GUIContainerMetaTile_Machine {
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         if (mContainer != null) {
             TecTechFontRender.INSTANCE.drawSplitString("Parameters X: " + ((GT_Container_ParamAdv) mContainer).param, 46, 7, 167, 0xffffff);
-            Locale locale = Locale.getDefault();
-            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).input0d)), 46, 16, 167, 0x22ddff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).input1d)), 46, 24, 167, 0x00ffff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).value0d)), 46, 33, 167, 0x00bbff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + String.format(locale, "%+.5E", (((GT_Container_ParamAdv) mContainer).value1d)), 46, 41, 167, 0x0077ff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + TT_Utility.formatNumberExp((((GT_Container_ParamAdv) mContainer).input0d)), 46, 16, 167, 0x22ddff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + TT_Utility.formatNumberExp((((GT_Container_ParamAdv) mContainer).input1d)), 46, 24, 167, 0x00ffff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + TT_Utility.formatNumberExp((((GT_Container_ParamAdv) mContainer).value0d)), 46, 33, 167, 0x00bbff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + TT_Utility.formatNumberExp((((GT_Container_ParamAdv) mContainer).value1d)), 46, 41, 167, 0x0077ff);
             GL11.glPushMatrix();
             GL11.glScalef(.5f,.5f,.5f);
-            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value0d)), 92, 100, 334, 0x00bbff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + Util.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value1d)), 92, 116, 334, 0x0077ff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06" + TT_Utility.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value0d)), 92, 100, 334, 0x00bbff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06" + TT_Utility.longBitsToShortString(Double.doubleToLongBits(((GT_Container_ParamAdv) mContainer).value1d)), 92, 116, 334, 0x0077ff);
             GL11.glPopMatrix();
             TecTechFontRender.INSTANCE.drawSplitString("Pointer " + Integer.toHexString(((GT_Container_ParamAdv) mContainer).pointer | 0x10000).substring(1), 46, 66, 167, 0x0033ff);
         } else {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java
index 50e608294e..e10f30076d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_ParamText.java
@@ -1,16 +1,15 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
-import com.github.technus.tectech.util.Util;
 import com.github.technus.tectech.font.TecTechFontRender;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_ParamText;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.TextParametersMessage;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.InventoryPlayer;
 
-import java.util.Locale;
 import java.util.Objects;
 
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
@@ -77,11 +76,10 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine {
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
         if (mContainer != null) {
             TecTechFontRender.INSTANCE.drawSplitString("Parameters tXt: " + ((GT_Container_ParamText) mContainer).param, 46, 7, 167, 0xffffff);
-            Locale locale = Locale.getDefault();
             TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b06", 10, 29, 16, 0x00bbff);
             TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b06", 10, 44, 16, 0x0077ff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamText) mContainer).input0d)), 10, 56, 167, 0x22ddff);
-            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + String.format(locale, "%+.5E", (((GT_Container_ParamText) mContainer).input1d)), 10, 65, 167, 0x00ffff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u24EA\u2b07" + TT_Utility.formatNumberExp((((GT_Container_ParamText) mContainer).input0d)), 10, 56, 167, 0x22ddff);
+            TecTechFontRender.INSTANCE.drawSplitString("\u2460\u2b07" + TT_Utility.formatNumberExp((((GT_Container_ParamText) mContainer).input1d)), 10, 65, 167, 0x00ffff);
         } else {
             TecTechFontRender.INSTANCE.drawSplitString("Parameters tXt", 46, 7, 167, 0xffffff);
         }
@@ -107,12 +105,12 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine {
             try {
                 if (str.contains("b")) {
                     String[] split = str.split("b");
-                    val = Util.bitStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
+                    val = TT_Utility.bitStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
                 } else if (str.contains("x")) {
                     String[] split = str.split("x");
-                    val = Util.hexStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
+                    val = TT_Utility.hexStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
                 } else {
-                    val = Util.stringToDouble(str);
+                    val = TT_Utility.stringToDouble(str);
                 }
                 if (!Objects.equals(((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value0s, value0tb.getText())) {
                     ((GT_Container_ParamText) mContainer).value0s = value0tb.getText();
@@ -135,12 +133,12 @@ public class GT_GUIContainer_ParamText extends GT_GUIContainerMetaTile_Machine {
             try {
                 if (str.contains("b")) {
                     String[] split = str.split("b");
-                    val = Util.bitStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
+                    val = TT_Utility.bitStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
                 } else if (str.contains("x")) {
                     String[] split = str.split("x");
-                    val = Util.hexStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
+                    val = TT_Utility.hexStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_",""));
                 } else {
-                    val = Util.stringToDouble(str);
+                    val = TT_Utility.stringToDouble(str);
                 }
                 if (!Objects.equals(((GT_MetaTileEntity_Hatch_ParamText) ((GT_Container_ParamText) mContainer).mTileEntity.getMetaTileEntity()).value1s, value1tb.getText())) {
                     ((GT_Container_ParamText) mContainer).value1s = value1tb.getText();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
index 6ad3282d9d..3f8e9170de 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_computer.java
@@ -8,7 +8,7 @@ import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_H
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.util.Vec3Impl;
@@ -295,7 +295,7 @@ public class GT_MetaTileEntity_EM_computer extends GT_MetaTileEntity_MultiblockB
     public String[] getDescription() {
         return new String[]{
                 CommonValues.TEC_MARK_EM,
-                Util.intBitsToString(TecTech.RANDOM.nextInt()),
+                TT_Utility.intBitsToString(TecTech.RANDOM.nextInt()),
                 EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.em.computer.desc")//You need it to process the number above
         };
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
index dc218da530..306d470a8e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_quantizer.java
@@ -36,7 +36,7 @@ import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset;
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 import static com.github.technus.tectech.util.CommonValues.V;
-import static com.github.technus.tectech.util.Util.isInputEqual;
+import static com.github.technus.tectech.util.TT_Utility.isInputEqual;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index 8583f03193..474dbdab2c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -43,7 +43,7 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileE
 import static com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine.machine;
 import static com.github.technus.tectech.util.CommonValues.V;
 import static com.github.technus.tectech.util.CommonValues.VN;
-import static com.github.technus.tectech.util.Util.areBitsSet;
+import static com.github.technus.tectech.util.TT_Utility.areBitsSet;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
 import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
 import static gregtech.api.util.GT_StructureUtility.ofHatchAdder;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java
index c2d1012910..1691940997 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.base;
 
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -134,8 +134,8 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine {
             var1.sendProgressBarUpdate(this, 120, eCertainMode | (eCertainStatus << 8));
             var1.sendProgressBarUpdate(this, 121, (ePowerPass ? 1 : 0) + (eSafeVoid ? 2 : 0) + (allowedToWork ? 4 : 0) + (ePowerPassButton?8:0));
             for(int i=128,k=208,j=0;j<20;j++,i+=4,k+=4) {
-                Util.sendDouble(eParamsOut[j], this, var1, i);
-                Util.sendDouble(eParamsIn[j], this, var1, k);
+                TT_Utility.sendDouble(eParamsOut[j], this, var1, i);
+                TT_Utility.sendDouble(eParamsIn[j], this, var1, k);
             }
         }
     }
@@ -159,10 +159,10 @@ public class GT_Container_MultiMachineEM extends GT_ContainerMetaTile_Machine {
             ePowerPassCover = (par2 & 8) == 8;
         } else if(par1>=128 && par1<208){
             int pos=(par1-128)>>2;
-            eParamsOut[pos]=Double.longBitsToDouble(eParamsOutl[pos]=Util.receiveLong(eParamsOutl[pos],par1&0xFFFFFFFC,par1,par2));
+            eParamsOut[pos]=Double.longBitsToDouble(eParamsOutl[pos]= TT_Utility.receiveLong(eParamsOutl[pos],par1&0xFFFFFFFC,par1,par2));
         }else if(par1>=208 && par1<288){
             int pos=(par1-208)>>2;
-            eParamsIn[pos]=Double.longBitsToDouble(eParamsInl[pos]=Util.receiveLong(eParamsInl[pos],par1&0xFFFFFFFC,par1,par2));
+            eParamsIn[pos]=Double.longBitsToDouble(eParamsInl[pos]= TT_Utility.receiveLong(eParamsInl[pos],par1&0xFFFFFFFC,par1,par2));
         }
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 3a019de78c..d4fe7b6e49 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -8,7 +8,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMDefini
 import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.EMInstanceStack;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.*;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.alignment.IAlignment;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
@@ -47,7 +47,7 @@ import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage;
 import static com.github.technus.tectech.util.CommonValues.*;
 import static com.github.technus.tectech.util.DoubleCount.div;
-import static com.github.technus.tectech.util.Util.getTier;
+import static com.github.technus.tectech.util.TT_Utility.getTier;
 import static java.lang.Math.min;
 
 /**
@@ -295,7 +295,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                 EnumChatFormatting.YELLOW + ":" +
                 EnumChatFormatting.AQUA + "I  " + parametrization.getStatusIn(hatchNo, paramID).name.get());
         list.add(EnumChatFormatting.WHITE + "Value: " +
-                EnumChatFormatting.AQUA + Util.doubleToString(parametrization.getIn(hatchNo, paramID)));
+                EnumChatFormatting.AQUA + TT_Utility.doubleToString(parametrization.getIn(hatchNo, paramID)));
         try {
             list.add(parametrization.groups[hatchNo].parameterIn[paramID].getBrief());
         } catch (NullPointerException | IndexOutOfBoundsException e) {
@@ -318,7 +318,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt
                 EnumChatFormatting.YELLOW + ":" +
                 EnumChatFormatting.AQUA + "O " + parametrization.getStatusOut(hatchNo, paramID).name.get());
         list.add(EnumChatFormatting.WHITE + "Value: " +
-                EnumChatFormatting.AQUA + Util.doubleToString(parametrization.getOut(hatchNo, paramID)));
+                EnumChatFormatting.AQUA + TT_Utility.doubleToString(parametrization.getOut(hatchNo, paramID)));
         try {
             list.add(parametrization.groups[hatchNo].parameterOut[paramID].getBrief());
         } catch (NullPointerException | IndexOutOfBoundsException e) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
index 2c4217aaba..1f791963e0 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/em_machine/GT_MetaTileEntity_EM_machine.java
@@ -6,7 +6,7 @@ import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.block.QuantumStuffBlock;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -110,7 +110,7 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
             return false;
         }
         loadedMachine = newMachine;
-        Supplier<IBehaviour> behaviourSupplier = GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP.get(new Util.ItemStack_NoNBT(newMachine));
+        Supplier<IBehaviour> behaviourSupplier = GT_MetaTileEntity_EM_machine.BEHAVIOUR_MAP.get(new TT_Utility.ItemStack_NoNBT(newMachine));
         if (currentBehaviour == null && behaviourSupplier == null) {
             return false;
         }
@@ -132,11 +132,11 @@ public class GT_MetaTileEntity_EM_machine extends GT_MetaTileEntity_MultiblockBa
         return true;
     }
 
-    private static final HashMap<Util.ItemStack_NoNBT, Supplier<IBehaviour>> BEHAVIOUR_MAP = new HashMap<>();
+    private static final HashMap<TT_Utility.ItemStack_NoNBT, Supplier<IBehaviour>> BEHAVIOUR_MAP = new HashMap<>();
 
     public static void registerBehaviour(Supplier<IBehaviour> behaviour, ItemStack is) {
-        BEHAVIOUR_MAP.put(new Util.ItemStack_NoNBT(is), behaviour);
-        TecTech.LOGGER.info("Registered EM machine behaviour " + behaviour.get().getClass().getSimpleName() + ' ' + new Util.ItemStack_NoNBT(is).toString());
+        BEHAVIOUR_MAP.put(new TT_Utility.ItemStack_NoNBT(is), behaviour);
+        TecTech.LOGGER.info("Registered EM machine behaviour " + behaviour.get().getClass().getSimpleName() + ' ' + new TT_Utility.ItemStack_NoNBT(is).toString());
     }
 
     public interface IBehaviour {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java
index 737046729f..8d9c245d98 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_BuckConverter;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_BuckConverter;
 import cpw.mods.fml.relauncher.Side;
@@ -29,12 +29,12 @@ public class GT_MetaTileEntity_BuckConverter extends GT_MetaTileEntity_TieredMac
 
     public GT_MetaTileEntity_BuckConverter(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_BuckConverter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
index 748b680faa..fe300f7ed2 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_DataReader;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_DataReader;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -38,17 +38,17 @@ import static net.minecraft.util.StatCollector.translateToLocal;
  * Created by Tec on 23.03.2017.
  */
 public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine {
-    private static final HashMap<Util.ItemStack_NoNBT,ArrayList<IDataRender>> RENDER_REGISTRY =new HashMap<>();
-    public static GT_RenderedTexture READER_ONLINE, READER_OFFLINE;
+    private static final HashMap<TT_Utility.ItemStack_NoNBT,ArrayList<IDataRender>> RENDER_REGISTRY =new HashMap<>();
+    public static GT_RenderedTexture                                                READER_ONLINE, READER_OFFLINE;
 
     public GT_MetaTileEntity_DataReader(int aID, String aName, String aNameRegional, int aTier) {
         super(aID,aName,aNameRegional,aTier,1,"",1,1,"dataReader.png","");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_DataReader(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName,aTier,1,aDescription,aTextures,1,1,"dataReader.png","");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     @Override
@@ -91,7 +91,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
             return DID_NOT_FIND_RECIPE;
         }
         ItemStack input=getInputAt(0);
-        for(IDataRender render:getRenders(new Util.ItemStack_NoNBT(input))){
+        for(IDataRender render:getRenders(new TT_Utility.ItemStack_NoNBT(input))){
             if(render.canRender(input,mTier)){
                 mOutputItems[0]=input.copy();
                 input.stackSize-=1;
@@ -175,7 +175,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
         return maxEUInput()*4L;
     }
 
-    public static void addDataRender(Util.ItemStack_NoNBT stack, IDataRender render){
+    public static void addDataRender(TT_Utility.ItemStack_NoNBT stack, IDataRender render){
         ArrayList<IDataRender> renders = RENDER_REGISTRY.computeIfAbsent(stack, k -> new ArrayList<>());
         if(FMLCommonHandler.instance().getEffectiveSide().isClient()) {
             render.loadResources();
@@ -183,7 +183,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
         renders.add(render);
     }
 
-    public static List<IDataRender> getRenders(Util.ItemStack_NoNBT stack){
+    public static List<IDataRender> getRenders(TT_Utility.ItemStack_NoNBT stack){
         ArrayList<IDataRender> iDataRenders = RENDER_REGISTRY.get(stack);
         return iDataRenders==null?Collections.emptyList():iDataRenders;
     }
@@ -205,7 +205,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
     }
 
     public static void run(){
-        addDataRender(new Util.ItemStack_NoNBT(ItemList.Tool_DataStick.get(1)),new IDataRender() {
+        addDataRender(new TT_Utility.ItemStack_NoNBT(ItemList.Tool_DataStick.get(1)),new IDataRender() {
             @SideOnly(Side.CLIENT)
             private ResourceLocation bg;
             @SideOnly(Side.CLIENT)
@@ -271,8 +271,8 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine
             public void renderForeground(ItemStack itemStack, int mouseX, int mouseY, GT_GUIContainer_DataReader gui, FontRenderer font) {
                 int time=itemStack.stackTagCompound.getInteger("time");
                 int EUt=itemStack.stackTagCompound.getInteger("eu");
-                font.drawString("Assembly Line Recipe", 7, 8, 0x80a0ff);
-                font.drawString(GT_Utility.trans("152","Total: ") + GT_Utility.formatNumbers((long)time * EUt) + " EU",7,93, 0x80a0ff);
+                font.drawString(translateToLocal("tt.keyphrase.Ass_line_recipe"), 7, 8, 0x80a0ff);
+                font.drawString(GT_Utility.trans("152","Total: ") + GT_Utility.formatNumbers((long) time * EUt) + " EU",7,93, 0x80a0ff);
                 font.drawString(GT_Utility.trans("153","Usage: ") + GT_Utility.formatNumbers(EUt) + " EU/t",7,103, 0x80a0ff);
                 font.drawString(GT_Utility.trans("154","Voltage: ") + GT_Utility.formatNumbers(EUt) + " EU",7,113, 0x80a0ff);
                 font.drawString(GT_Utility.trans("155","Amperage: ") + 1 ,7,123, 0x80a0ff);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java
index 0d5a59a5c1..82f8c77536 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OverflowElemental;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_DebugPollutor;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_DebugPollutor;
@@ -35,12 +35,12 @@ public class GT_MetaTileEntity_DebugPollutor extends GT_MetaTileEntity_TieredMac
 
     public GT_MetaTileEntity_DebugPollutor(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_DebugPollutor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java
index 931da27e6c..327f66ecf6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_DebugPowerGenerator;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_DebugPowerGenerator;
 import cpw.mods.fml.relauncher.Side;
@@ -32,12 +32,12 @@ public class GT_MetaTileEntity_DebugPowerGenerator extends GT_MetaTileEntity_Tie
 
     public GT_MetaTileEntity_DebugPowerGenerator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_DebugPowerGenerator(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
index 01d5e2321e..46b3d5e927 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
@@ -4,7 +4,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_Container_DebugStructureWriter;
 import com.github.technus.tectech.thing.metaTileEntity.single.gui.GT_GUIContainer_DebugStructureWriter;
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing;
 import com.gtnewhorizon.structurelib.structure.StructureUtility;
 import cpw.mods.fml.relauncher.Side;
@@ -20,13 +20,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import java.util.Comparator;
-import java.util.function.Function;
-
 import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT;
 import static net.minecraft.util.StatCollector.translateToLocal;
 
@@ -41,12 +37,12 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti
 
     public GT_MetaTileEntity_DebugStructureWriter(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_DebugStructureWriter(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java
index 9bac9df2f3..0ab08c356e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java
@@ -10,7 +10,7 @@ import com.github.technus.avrClone.memory.EepromMemory;
 import com.github.technus.avrClone.memory.RemovableMemory;
 import com.github.technus.avrClone.memory.program.ProgramMemory;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.mechanics.avr.SidedRedstone;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
@@ -41,12 +41,12 @@ public class GT_MetaTileEntity_MicroController extends GT_MetaTileEntity_TieredM
 
     public GT_MetaTileEntity_MicroController(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "AVR Micro-controller");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_MicroController(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
         core=new AvrCore();
         core.setUsingImmersiveOperands(false);
         core.setInstructionRegistry(InstructionRegistry.INSTRUCTION_REGISTRY_OP);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java
index 03ec9efd89..3ba7bcf885 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Textures;
@@ -36,12 +36,12 @@ public class GT_MetaTileEntity_OwnerDetector extends GT_MetaTileEntity_TieredMac
 
     public GT_MetaTileEntity_OwnerDetector(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 0, "");
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     public GT_MetaTileEntity_OwnerDetector(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, 0, aDescription, aTextures);
-        Util.setTier(aTier,this);
+        TT_Utility.setTier(aTier,this);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java
index 61f2259c5c..c5391537a6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java
@@ -1,7 +1,7 @@
 package com.github.technus.tectech.thing.metaTileEntity.single;
 
 import com.github.technus.tectech.util.CommonValues;
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -13,12 +13,12 @@ import static net.minecraft.util.StatCollector.translateToLocal;
 public class GT_MetaTileEntity_TT_Transformer extends GT_MetaTileEntity_Transformer {
     public GT_MetaTileEntity_TT_Transformer(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "");
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_TT_Transformer(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
index 3b240e4c56..475e8ac10a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
@@ -7,8 +7,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.spark.RendererMessage;
 import com.github.technus.tectech.mechanics.spark.ThaumSpark;
-import com.github.technus.tectech.util.Util;
-import com.google.common.collect.ArrayListMultimap;
+import com.github.technus.tectech.util.TT_Utility;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.MultimapBuilder;
 import com.gtnewhorizon.structurelib.util.Vec3Impl;
@@ -62,7 +61,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
 
     public GT_MetaTileEntity_TeslaCoil(int aID, String aName, String aNameRegional, int aTier, int aSlotCount) {
         super(aID, aName, aNameRegional, aTier, "", aSlotCount);
-        Util.setTier(aTier, this);
+        TT_Utility.setTier(aTier, this);
     }
 
     public GT_MetaTileEntity_TeslaCoil(String aName, int aTier, String aDescription, ITexture[][][] aTextures, int aSlotCount) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java
index b40a9126b7..4e4a235ca4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_Container_DebugPollutor.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.single.gui;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugPollutor;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -129,8 +129,8 @@ public class GT_Container_DebugPollutor
 
         for (Object crafter : crafters) {
             ICrafting var1 = (ICrafting) crafter;
-            Util.sendInteger(pollution,this,var1,100);
-            Util.sendFloat(anomaly,this,var1,102);
+            TT_Utility.sendInteger(pollution,this,var1,100);
+            TT_Utility.sendFloat(anomaly,this,var1,102);
         }
     }
 
@@ -141,11 +141,11 @@ public class GT_Container_DebugPollutor
         switch (par1) {
             case 100:
             case 101:
-                pollution = Util.receiveInteger(pollution,100,par1,par2);
+                pollution = TT_Utility.receiveInteger(pollution,100,par1,par2);
                 break;
             case 102:
             case 103:
-                anomaly = Float.intBitsToFloat(anomalyInt=Util.receiveInteger(anomalyInt,102,par1,par2));
+                anomaly = Float.intBitsToFloat(anomalyInt= TT_Utility.receiveInteger(anomalyInt,102,par1,par2));
                 break;
         }
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_BuckConverter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_BuckConverter.java
index 6b6b778d40..1cff7e6c30 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_BuckConverter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_BuckConverter.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.single.gui;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -19,7 +19,7 @@ public class GT_GUIContainer_BuckConverter extends GT_GUIContainerMetaTile_Machi
         if (mContainer != null) {
             GT_Container_BuckConverter buck = (GT_Container_BuckConverter) mContainer;
             fontRendererObj.drawString("EUT: " + buck.EUT, 46, 24, 16448255);
-            fontRendererObj.drawString("TIER: " + VN[Util.getTier(buck.EUT<0?-buck.EUT:buck.EUT)], 46, 32, 16448255);
+            fontRendererObj.drawString("TIER: " + VN[TT_Utility.getTier(buck.EUT<0?-buck.EUT:buck.EUT)], 46, 32, 16448255);
             fontRendererObj.drawString("AMP: " + buck.AMP, 46, 40, 16448255);
             fontRendererObj.drawString("SUM: " + (long)buck.AMP*buck.EUT, 46, 48, 16448255);
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java
index bde5b90048..4731374c31 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.single.gui;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DataReader;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
@@ -15,7 +15,6 @@ import net.minecraft.util.IIcon;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class GT_GUIContainer_DataReader extends GT_GUIContainerMetaTile_Machine {
@@ -116,7 +115,7 @@ public class GT_GUIContainer_DataReader extends GT_GUIContainerMetaTile_Machine
     private void renderDataBG(ItemStack thing, int mouseX, int mouseY, int x, int y, byte mTier) {
         if (thing != null) {
             for (GT_MetaTileEntity_DataReader.IDataRender render :
-                    GT_MetaTileEntity_DataReader.getRenders(new Util.ItemStack_NoNBT(thing))) {
+                    GT_MetaTileEntity_DataReader.getRenders(new TT_Utility.ItemStack_NoNBT(thing))) {
                 if (render.canRender(thing, mTier)) {
                     if (!GT_Utility.areStacksEqual(stack, thing, false)) {
                         render.initRender(thing);
@@ -134,7 +133,7 @@ public class GT_GUIContainer_DataReader extends GT_GUIContainerMetaTile_Machine
             return false;
         }
         for (GT_MetaTileEntity_DataReader.IDataRender render :
-                GT_MetaTileEntity_DataReader.getRenders(new Util.ItemStack_NoNBT(stack))) {
+                GT_MetaTileEntity_DataReader.getRenders(new TT_Utility.ItemStack_NoNBT(stack))) {
             if (render.canRender(stack, mTier)) {
                 render.renderForeground(stack, mouseX, mouseY, this, fontRendererObj);
                 return true;
@@ -148,7 +147,7 @@ public class GT_GUIContainer_DataReader extends GT_GUIContainerMetaTile_Machine
             return false;
         }
         for (GT_MetaTileEntity_DataReader.IDataRender render :
-                GT_MetaTileEntity_DataReader.getRenders(new Util.ItemStack_NoNBT(stack))) {
+                GT_MetaTileEntity_DataReader.getRenders(new TT_Utility.ItemStack_NoNBT(stack))) {
             if (render.canRender(stack, mTier)) {
                 render.renderTooltips(stack, mouseX, mouseY, this);
                 return true;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugPowerGenerator.java
index ee6e952040..f1f5050d9d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugPowerGenerator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DebugPowerGenerator.java
@@ -1,6 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.single.gui;
 
-import com.github.technus.tectech.util.Util;
+import com.github.technus.tectech.util.TT_Utility;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -19,7 +19,7 @@ public class GT_GUIContainer_DebugPowerGenerator extends GT_GUIContainerMetaTile
         if (mContainer != null) {
             GT_Container_DebugPowerGenerator dpg = (GT_Container_DebugPowerGenerator) mContainer;
             fontRendererObj.drawString("EUT: " + dpg.EUT, 46, 24, 16448255);
-            fontRendererObj.drawString("TIER: " + VN[Util.getTier(dpg.EUT<0?-dpg.EUT:dpg.EUT)], 46, 32, 16448255);
+            fontRendererObj.drawString("TIER: " + VN[TT_Utility.getTier(dpg.EUT<0?-dpg.EUT:dpg.EUT)], 46, 32, 16448255);
             fontRendererObj.drawString("AMP: " + dpg.AMP, 46, 40, 16448255);
             fontRendererObj.drawString("SUM: " + (long)dpg.AMP*dpg.EUT, 46, 48, 16448255);
         }
diff --git a/src/main/java/com/github/technus/tectech/util/TT_Utility.java b/src/main/java/com/github/technus/tectech/util/TT_Utility.java
new file mode 100644
index 0000000000..c989fe1e1f
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/util/TT_Utility.java
@@ -0,0 +1,613 @@
+package com.github.technus.tectech.util;
+
+import com.github.technus.tectech.TecTech;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.ObfuscationReflectionHelper;
+import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.api.GregTech_API;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompressedStreamTools;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.ChunkCoordIntPair;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.storage.IPlayerFileData;
+import net.minecraft.world.storage.SaveHandler;
+import net.minecraftforge.fluids.FluidStack;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+/**
+ * Created by Tec on 21.03.2017.
+ */
+public final class TT_Utility {
+    private TT_Utility() {
+    }
+    private static final Map<Locale, Formatter> formaters=new HashMap<>();
+
+    private static Formatter getFormatter(){
+        return formaters.computeIfAbsent(Locale.getDefault(Locale.Category.FORMAT), Formatter::new);
+    }
+
+    public static String formatNumberShortExp(double value){
+        return getFormatter().format("%.3E", value).toString();
+    }
+
+    public static String formatNumberExp(double value){
+        return getFormatter().format("%+.5E", value).toString();
+    }
+
+    public static String formatNumberIntHex(int value){
+        return getFormatter().format("%08X", value).toString();
+    }
+
+    @SuppressWarnings("ComparatorMethodParameterNotUsed")
+    public static <K, V extends Comparable<? super V>> SortedSet<Map.Entry<K, V>> entriesSortedByValues(Map<K, V> map) {
+        SortedSet<Map.Entry<K, V>> sortedEntries = new TreeSet<>(
+                (e1, e2) -> {
+                    int res = e1.getValue().compareTo(e2.getValue());
+                    return res != 0 ? res : 1; // Special fix to preserve items with equal values
+                }
+        );
+        sortedEntries.addAll(map.entrySet());
+        return sortedEntries;
+    }
+
+    public static int bitStringToInt(String bits){
+        if(bits==null){
+            return 0;
+        }
+        if(bits.length() > 32){
+            throw new NumberFormatException("Too long!");
+        }
+        return Integer.parseInt(bits,2);
+    }
+
+    public static int hexStringToInt(String hex){
+        if(hex==null){
+            return 0;
+        }
+        if(hex.length()>8){
+            throw new NumberFormatException("Too long!");
+        }
+        return Integer.parseInt(hex,16);
+    }
+
+    public static double stringToDouble(String str){
+        if(str==null){
+            return 0;
+        }
+        return Double.parseDouble(str);
+    }
+
+    public static double getValue(String in1) {
+        String str = in1.toLowerCase();
+        double val;
+        try {
+            if (str.contains("b")) {
+                String[] split = str.split("b");
+                val = TT_Utility.bitStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_", ""));
+            } else if (str.contains("x")) {
+                String[] split = str.split("x");
+                val = TT_Utility.hexStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_", ""));
+            } else {
+                val = TT_Utility.stringToDouble(str);
+            }
+            return val;
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+
+    public static String intBitsToString(int number) {
+        StringBuilder result = new StringBuilder(16);
+
+        for (int i = 31; i >= 0; i--) {
+            int mask = 1 << i;
+            result.append((number & mask) != 0 ? "1" : "0");
+
+            if (i % 8 == 0) {
+                result.append(' ');
+            }
+        }
+        result.replace(result.length() - 1, result.length(), "");
+
+        return result.toString();
+    }
+
+    public static String intBitsToShortString(int number) {
+        StringBuilder result = new StringBuilder(35);
+
+        for (int i = 31; i >= 0; i--) {
+            int mask = 1 << i;
+            result.append((number & mask) != 0 ? ":" : ".");
+
+            if (i % 8 == 0) {
+                result.append('|');
+            }
+        }
+        result.replace(result.length() - 1, result.length(), "");
+
+        return result.toString();
+    }
+
+    public static String longBitsToShortString(long number) {
+        StringBuilder result = new StringBuilder(71);
+
+        for (int i = 63; i >= 0; i--) {
+            long mask = 1L << i;
+            result.append((number & mask) != 0 ? ":" : ".");
+
+            if (i % 8 == 0) {
+                result.append('|');
+            }
+        }
+        result.replace(result.length() - 1, result.length(), "");
+
+        return result.toString();
+    }
+
+    public static float map(float x, float in_min, float in_max, float out_min, float out_max) {
+        return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
+    }
+
+    public static boolean isInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] requiredFluidInputs, ItemStack[] requiredInputs, FluidStack[] givenFluidInputs, ItemStack... givenInputs) {
+        if (!GregTech_API.sPostloadFinished) {
+            return false;
+        }
+        if (requiredFluidInputs.length > 0 && givenFluidInputs == null) {
+            return false;
+        }
+        int amt;
+        for (FluidStack tFluid : requiredFluidInputs) {
+            if (tFluid != null) {
+                boolean temp = true;
+                amt = tFluid.amount;
+                for (FluidStack aFluid : givenFluidInputs) {
+                    if (aFluid != null && aFluid.isFluidEqual(tFluid)) {
+                        if (aDontCheckStackSizes) {
+                            temp = false;
+                            break;
+                        }
+                        amt -= aFluid.amount;
+                        if (amt < 1) {
+                            temp = false;
+                            break;
+                        }
+                    }
+                }
+                if (temp) {
+                    return false;
+                }
+            }
+        }
+
+        if (requiredInputs.length > 0 && givenInputs == null) {
+            return false;
+        }
+        for (ItemStack tStack : requiredInputs) {
+            if (tStack != null) {
+                amt = tStack.stackSize;
+                boolean temp = true;
+                for (ItemStack aStack : givenInputs) {
+                    if (GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) {
+                        if (aDontCheckStackSizes) {
+                            temp = false;
+                            break;
+                        }
+                        amt -= aStack.stackSize;
+                        if (amt < 1) {
+                            temp = false;
+                            break;
+                        }
+                    }
+                }
+                if (temp) {
+                    return false;
+                }
+            }
+        }
+
+        if (aDecreaseStacksizeBySuccess) {
+            if (givenFluidInputs != null) {
+                for (FluidStack tFluid : requiredFluidInputs) {
+                    if (tFluid != null) {
+                        amt = tFluid.amount;
+                        for (FluidStack aFluid : givenFluidInputs) {
+                            if (aFluid != null && aFluid.isFluidEqual(tFluid)) {
+                                if (aDontCheckStackSizes) {
+                                    aFluid.amount -= amt;
+                                    break;
+                                }
+                                if (aFluid.amount < amt) {
+                                    amt -= aFluid.amount;
+                                    aFluid.amount = 0;
+                                } else {
+                                    aFluid.amount -= amt;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (givenInputs != null) {
+                for (ItemStack tStack : requiredInputs) {
+                    if (tStack != null) {
+                        amt = tStack.stackSize;
+                        for (ItemStack aStack : givenInputs) {
+                            if (GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) {
+                                if (aDontCheckStackSizes) {
+                                    aStack.stackSize -= amt;
+                                    break;
+                                }
+                                if (aStack.stackSize < amt) {
+                                    amt -= aStack.stackSize;
+                                    aStack.stackSize = 0;
+                                } else {
+                                    aStack.stackSize -= amt;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public static String getUniqueIdentifier(ItemStack is) {
+        return GameRegistry.findUniqueIdentifierFor(is.getItem()).modId + ':' + is.getUnlocalizedName();
+    }
+
+    public static byte getTier(long l) {
+        byte b = -1;
+
+        do {
+            ++b;
+            if (b >= CommonValues.V.length) {
+                return b;
+            }
+        } while (l > CommonValues.V[b]);
+
+        return b;
+    }
+
+    public static String[] splitButDifferent(String string, String delimiter) {
+        String[] strings = new String[StringUtils.countMatches(string, delimiter) + 1];
+        int lastEnd = 0;
+        for (int i = 0; i < strings.length - 1; i++) {
+            int nextEnd = string.indexOf(delimiter, lastEnd);
+            strings[i] = string.substring(lastEnd, nextEnd);
+            lastEnd = nextEnd + delimiter.length();
+        }
+        strings[strings.length - 1] = string.substring(lastEnd);
+        return strings;
+    }
+
+    public static String[] infoFromNBT(NBTTagCompound nbt) {
+        String[] strings = new String[nbt.getInteger("i")];
+        for (int i = 0; i < strings.length; i++) {
+            strings[i] = nbt.getString(Integer.toString(i));
+        }
+        return strings;
+    }
+
+    public static boolean areBitsSet(int setBits, int testedValue) {
+        return (testedValue & setBits) == setBits;
+    }
+
+    public static class ItemStack_NoNBT implements Comparable<ItemStack_NoNBT> {
+        public final Item mItem;
+        public final int mStackSize;
+        public final int mMetaData;
+
+        public ItemStack_NoNBT(Item aItem, long aStackSize, long aMetaData) {
+            this.mItem = aItem;
+            this.mStackSize = (byte) ((int) aStackSize);
+            this.mMetaData = (short) ((int) aMetaData);
+        }
+
+        public ItemStack_NoNBT(ItemStack aStack) {
+            if (aStack == null) {
+                mItem = null;
+                mStackSize = mMetaData = 0;
+            } else {
+                mItem = aStack.getItem();
+                mStackSize = aStack.stackSize;
+                mMetaData = Items.feather.getDamage(aStack);
+            }
+        }
+
+        @Override
+        public int compareTo(ItemStack_NoNBT o) {
+            if (mMetaData > o.mMetaData) return 1;
+            if (mMetaData < o.mMetaData) return -1;
+            if (mStackSize > o.mStackSize) return 1;
+            if (mStackSize < o.mStackSize) return -1;
+            if (mItem != null && o.mItem != null)
+                return mItem.getUnlocalizedName().compareTo(o.mItem.getUnlocalizedName());
+            if (mItem == null && o.mItem == null) return 0;
+            if (mItem != null) return 1;
+            return -1;
+        }
+
+        @Override
+        public boolean equals(Object aStack) {
+            return aStack == this ||
+                    (aStack instanceof ItemStack_NoNBT &&
+                            ((mItem == ((ItemStack_NoNBT) aStack).mItem) || ((ItemStack_NoNBT) aStack).mItem.getUnlocalizedName().equals(this.mItem.getUnlocalizedName())) &&
+                            ((ItemStack_NoNBT) aStack).mStackSize == this.mStackSize &&
+                            ((ItemStack_NoNBT) aStack).mMetaData == this.mMetaData);
+        }
+
+        @Override
+        public int hashCode() {
+            return (mItem != null ? mItem.getUnlocalizedName().hashCode() : 0) ^ (mMetaData << 16) ^ (mStackSize << 24);
+        }
+
+        @Override
+        public String toString() {
+            return Integer.toString(hashCode()) + ' ' + (mItem == null ? "null" : mItem.getUnlocalizedName()) + ' ' + mMetaData + ' ' + mStackSize;
+        }
+    }
+
+    public static void setTier(int tier,Object me){
+        try{
+            Field field=GT_MetaTileEntity_TieredMachineBlock.class.getField("mTier");
+            field.setAccessible(true);
+            field.set(me,(byte)tier);
+        }catch (Exception e){
+            //e.printStackTrace();
+        }
+    }
+
+    public static StringBuilder receiveString(StringBuilder previousValue, int startIndex, int index, int value){
+        int sizeReq=index-startIndex;
+        if(value==0){
+            previousValue.setLength(Math.min(previousValue.length(),sizeReq));
+        }else {
+            previousValue.setLength(Math.max(previousValue.length(),sizeReq));
+            previousValue.setCharAt(sizeReq,(char)value);
+        }
+        return previousValue;
+    }
+
+    @Deprecated
+    public static double receiveDouble(double previousValue, int startIndex, int index, int value){
+        return Double.longBitsToDouble(receiveLong(Double.doubleToLongBits(previousValue),startIndex,index,value));
+    }
+
+    public static long receiveLong(long previousValue, int startIndex, int index, int value){
+        value &=0xFFFF;
+        switch (index-startIndex){
+            case 0:
+                previousValue&= 0xFFFF_FFFF_FFFF_0000L;
+                previousValue|=value;
+                break;
+            case 1:
+                previousValue&=0xFFFF_FFFF_0000_FFFFL;
+                previousValue|=(long)value<<16;
+                break;
+            case 2:
+                previousValue&=0xFFFF_0000_FFFF_FFFFL;
+                previousValue|=(long)value<<32;
+                break;
+            case 3:
+                previousValue&=0x0000_FFFF_FFFF_FFFFL;
+                previousValue|=(long)value<<48;
+                break;
+        }
+        return previousValue;
+    }
+
+    public static void sendString(StringBuilder string,Container container, ICrafting crafter,int startIndex){
+        for (int i = 0; i < string.length(); i++) {
+            crafter.sendProgressBarUpdate(container,startIndex++,string.charAt(i));
+        }
+        crafter.sendProgressBarUpdate(container,startIndex,0);
+    }
+
+    public static void sendDouble(double value,Container container, ICrafting crafter,int startIndex){
+        sendLong(Double.doubleToLongBits(value),container,crafter,startIndex);
+    }
+
+    public static void sendLong(long value,Container container, ICrafting crafter,int startIndex){
+        crafter.sendProgressBarUpdate(container, startIndex++, (int)(value & 0xFFFFL));
+        crafter.sendProgressBarUpdate(container, startIndex++, (int)((value & 0xFFFF0000L)>>>16));
+        crafter.sendProgressBarUpdate(container, startIndex++, (int)((value & 0xFFFF00000000L)>>>32));
+        crafter.sendProgressBarUpdate(container, startIndex,   (int)((value & 0xFFFF000000000000L)>>>48));
+    }
+
+    @Deprecated
+    public static float receiveFloat(float previousValue, int startIndex, int index, int value){
+        return Float.intBitsToFloat(receiveInteger(Float.floatToIntBits(previousValue),startIndex,index,value));
+    }
+
+    public static int receiveInteger(int previousValue, int startIndex, int index, int value){
+        value &=0xFFFF;
+        switch (index-startIndex){
+            case 0:
+                previousValue&= 0xFFFF_0000;
+                previousValue|=value;
+                break;
+            case 1:
+                previousValue&=0x0000_FFFF;
+                previousValue|=value<<16;
+                break;
+        }
+        return previousValue;
+    }
+
+    public static void sendFloat(float value,Container container, ICrafting crafter,int startIndex){
+        sendInteger(Float.floatToIntBits(value),container,crafter,startIndex);
+    }
+
+    public static void sendInteger(int value,Container container, ICrafting crafter,int startIndex){
+        crafter.sendProgressBarUpdate(container, startIndex++, (int)(value & 0xFFFFL));
+        crafter.sendProgressBarUpdate(container, startIndex, (value & 0xFFFF0000)>>>16);
+    }
+
+    public static String doubleToString(double value){
+        if(value==(long)value){
+            return Long.toString((long)value);
+        }
+        return Double.toString(value);
+    }
+
+    public static boolean checkChunkExist(World world, ChunkCoordIntPair chunk){
+        int x=chunk.getCenterXPos();
+        int z=chunk.getCenterZPosition();
+        return world.checkChunksExist(x, 0, z, x, 0, z);
+    }
+
+    public static NBTTagCompound getPlayerData(UUID uuid1,UUID uuid2,String extension) {
+        try {
+            if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+                if (uuid1 != null && uuid2!=null) {
+                    IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer().worldServerForDimension(0).getSaveHandler().getSaveHandler();
+                    SaveHandler sh = (SaveHandler)playerNBTManagerObj;
+                    File dir = ObfuscationReflectionHelper.getPrivateValue(SaveHandler.class, sh, new String[]{"playersDirectory", "field_75771_c"});
+                    String id1=uuid1.toString();
+                    NBTTagCompound tagCompound=read(new File(dir, id1 + "."+extension));
+                    if(tagCompound!=null){
+                        return tagCompound;
+                    }
+                    tagCompound=readBackup(new File(dir, id1 + "."+extension+"_bak"));
+                    if(tagCompound!=null){
+                        return tagCompound;
+                    }
+                    String id2=uuid2.toString();
+                    tagCompound=read(new File(dir, id2 + "."+extension));
+                    if(tagCompound!=null){
+                        return tagCompound;
+                    }
+                    tagCompound=readBackup(new File(dir, id2 + "."+extension+"_bak"));
+                    if(tagCompound!=null){
+                        return tagCompound;
+                    }
+                }
+            }
+        } catch (Exception ignored) {}
+        return new NBTTagCompound();
+    }
+
+    public static void savePlayerFile(EntityPlayer player,String extension, NBTTagCompound data) {
+        try {
+            if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
+                if (player != null) {
+                    IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer().worldServerForDimension(0).getSaveHandler().getSaveHandler();
+                    SaveHandler sh = (SaveHandler)playerNBTManagerObj;
+                    File dir = ObfuscationReflectionHelper.getPrivateValue(SaveHandler.class, sh, new String[]{"playersDirectory", "field_75771_c"});
+                    String id1=player.getUniqueID().toString();
+                    write(new File(dir, id1 + "."+extension),data);
+                    write(new File(dir, id1 + "."+extension+"_bak"),data);
+                    String id2=UUID.nameUUIDFromBytes(player.getCommandSenderName().getBytes(StandardCharsets.UTF_8)).toString();
+                    write(new File(dir, id2 + "."+extension),data);
+                    write(new File(dir, id2 + "."+extension+"_bak"),data);
+                }
+            }
+        } catch (Exception ignored) {}
+    }
+
+    private static NBTTagCompound read(File file){
+        if (file != null && file.exists()) {
+            try(FileInputStream fileInputStream= new FileInputStream(file)) {
+                return CompressedStreamTools.readCompressed(fileInputStream);
+            } catch (Exception var9) {
+                TecTech.LOGGER.error("Cannot read NBT File: "+file.getAbsolutePath());
+            }
+        }
+        return null;
+    }
+
+    private static NBTTagCompound readBackup(File file){
+        if (file != null && file.exists()) {
+            try(FileInputStream fileInputStream= new FileInputStream(file)) {
+                return CompressedStreamTools.readCompressed(fileInputStream);
+            } catch (Exception var9) {
+                TecTech.LOGGER.error("Cannot read NBT File: "+file.getAbsolutePath());
+                return new NBTTagCompound();
+            }
+        }
+        return null;
+    }
+
+    private static void write(File file,NBTTagCompound tagCompound){
+        if (file != null) {
+            if(tagCompound==null){
+                if(file.exists()) file.delete();
+            }else {
+                try(FileOutputStream fileOutputStream= new FileOutputStream(file)) {
+                    CompressedStreamTools.writeCompressed(tagCompound,fileOutputStream);
+                } catch (Exception var9) {
+                    TecTech.LOGGER.error("Cannot write NBT File: "+file.getAbsolutePath());
+                }
+            }
+        }
+    }
+
+    public static AxisAlignedBB fromChunkCoordIntPair(ChunkCoordIntPair chunkCoordIntPair){
+        int x=chunkCoordIntPair.chunkXPos<<4;
+        int z=chunkCoordIntPair.chunkZPos<<4;
+        return AxisAlignedBB.getBoundingBox(x,-128,z,x+16,512,z+16);
+    }
+
+    public static AxisAlignedBB fromChunk(Chunk chunk){
+        int x=chunk.xPosition<<4;
+        int z=chunk.zPosition<<4;
+        return AxisAlignedBB.getBoundingBox(x,-128,z,x+16,512,z+16);
+    }
+
+    public static String getConcated(String[] strings,String separator){
+        StringBuilder stringBuilder = new StringBuilder();
+        for (String string : strings) {
+            stringBuilder.append(string).append(separator);
+        }
+        int length = stringBuilder.length();
+        if(length >=separator.length()){
+            stringBuilder.setLength(length -separator.length());
+        }
+        return stringBuilder.toString();
+    }
+
+    public static double getMagnitude3D(double[] in)
+    {
+        return Math.sqrt(in[0]*in[0]+in[1]*in[1]+in[2]*in[2]);
+    }
+
+    public static void normalize3D(double[] in, double[] out)
+    {
+        double mag=getMagnitude3D(in);
+        out[0]=in[0]/mag;
+        out[1]=in[1]/mag;
+        out[2]=in[2]/mag;
+    }
+
+    public static void crossProduct3D(double[] inA, double[] inB, double[] out)
+    {
+        out[0] = inA[1] * inB[2] - inA[2] * inB[1];
+        out[1] = inA[2] * inB[0] - inA[0] * inB[2];
+        out[2] = inA[0] * inB[1] - inA[1] * inB[0];
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/util/Util.java b/src/main/java/com/github/technus/tectech/util/Util.java
deleted file mode 100644
index 489246e061..0000000000
--- a/src/main/java/com/github/technus/tectech/util/Util.java
+++ /dev/null
@@ -1,596 +0,0 @@
-package com.github.technus.tectech.util;
-
-import com.github.technus.tectech.TecTech;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.ObfuscationReflectionHelper;
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.GregTech_API;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.CompressedStreamTools;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.ChunkCoordIntPair;
-import net.minecraft.world.World;
-import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.storage.IPlayerFileData;
-import net.minecraft.world.storage.SaveHandler;
-import net.minecraftforge.fluids.FluidStack;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.lang.reflect.Field;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-
-/**
- * Created by Tec on 21.03.2017.
- */
-public final class Util {
-    private Util() {
-    }
-
-    @SuppressWarnings("ComparatorMethodParameterNotUsed")
-    public static <K, V extends Comparable<? super V>> SortedSet<Map.Entry<K, V>> entriesSortedByValues(Map<K, V> map) {
-        SortedSet<Map.Entry<K, V>> sortedEntries = new TreeSet<>(
-                (e1, e2) -> {
-                    int res = e1.getValue().compareTo(e2.getValue());
-                    return res != 0 ? res : 1; // Special fix to preserve items with equal values
-                }
-        );
-        sortedEntries.addAll(map.entrySet());
-        return sortedEntries;
-    }
-
-    public static int bitStringToInt(String bits){
-        if(bits==null){
-            return 0;
-        }
-        if(bits.length() > 32){
-            throw new NumberFormatException("Too long!");
-        }
-        return Integer.parseInt(bits,2);
-    }
-
-    public static int hexStringToInt(String hex){
-        if(hex==null){
-            return 0;
-        }
-        if(hex.length()>8){
-            throw new NumberFormatException("Too long!");
-        }
-        return Integer.parseInt(hex,16);
-    }
-
-    public static double stringToDouble(String str){
-        if(str==null){
-            return 0;
-        }
-        return Double.parseDouble(str);
-    }
-
-    public static double getValue(String in1) {
-        String str = in1.toLowerCase();
-        double val;
-        try {
-            if (str.contains("b")) {
-                String[] split = str.split("b");
-                val = Util.bitStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_", ""));
-            } else if (str.contains("x")) {
-                String[] split = str.split("x");
-                val = Util.hexStringToInt(split[0].replaceAll("[^-]", "") + split[1].replaceAll("_", ""));
-            } else {
-                val = Util.stringToDouble(str);
-            }
-            return val;
-        } catch (Exception e) {
-            return 0;
-        }
-    }
-
-
-    public static String intBitsToString(int number) {
-        StringBuilder result = new StringBuilder(16);
-
-        for (int i = 31; i >= 0; i--) {
-            int mask = 1 << i;
-            result.append((number & mask) != 0 ? "1" : "0");
-
-            if (i % 8 == 0) {
-                result.append(' ');
-            }
-        }
-        result.replace(result.length() - 1, result.length(), "");
-
-        return result.toString();
-    }
-
-    public static String intBitsToShortString(int number) {
-        StringBuilder result = new StringBuilder(35);
-
-        for (int i = 31; i >= 0; i--) {
-            int mask = 1 << i;
-            result.append((number & mask) != 0 ? ":" : ".");
-
-            if (i % 8 == 0) {
-                result.append('|');
-            }
-        }
-        result.replace(result.length() - 1, result.length(), "");
-
-        return result.toString();
-    }
-
-    public static String longBitsToShortString(long number) {
-        StringBuilder result = new StringBuilder(71);
-
-        for (int i = 63; i >= 0; i--) {
-            long mask = 1L << i;
-            result.append((number & mask) != 0 ? ":" : ".");
-
-            if (i % 8 == 0) {
-                result.append('|');
-            }
-        }
-        result.replace(result.length() - 1, result.length(), "");
-
-        return result.toString();
-    }
-
-    public static float map(float x, float in_min, float in_max, float out_min, float out_max) {
-        return (x - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
-    }
-
-    public static boolean isInputEqual(boolean aDecreaseStacksizeBySuccess, boolean aDontCheckStackSizes, FluidStack[] requiredFluidInputs, ItemStack[] requiredInputs, FluidStack[] givenFluidInputs, ItemStack... givenInputs) {
-        if (!GregTech_API.sPostloadFinished) {
-            return false;
-        }
-        if (requiredFluidInputs.length > 0 && givenFluidInputs == null) {
-            return false;
-        }
-        int amt;
-        for (FluidStack tFluid : requiredFluidInputs) {
-            if (tFluid != null) {
-                boolean temp = true;
-                amt = tFluid.amount;
-                for (FluidStack aFluid : givenFluidInputs) {
-                    if (aFluid != null && aFluid.isFluidEqual(tFluid)) {
-                        if (aDontCheckStackSizes) {
-                            temp = false;
-                            break;
-                        }
-                        amt -= aFluid.amount;
-                        if (amt < 1) {
-                            temp = false;
-                            break;
-                        }
-                    }
-                }
-                if (temp) {
-                    return false;
-                }
-            }
-        }
-
-        if (requiredInputs.length > 0 && givenInputs == null) {
-            return false;
-        }
-        for (ItemStack tStack : requiredInputs) {
-            if (tStack != null) {
-                amt = tStack.stackSize;
-                boolean temp = true;
-                for (ItemStack aStack : givenInputs) {
-                    if (GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) {
-                        if (aDontCheckStackSizes) {
-                            temp = false;
-                            break;
-                        }
-                        amt -= aStack.stackSize;
-                        if (amt < 1) {
-                            temp = false;
-                            break;
-                        }
-                    }
-                }
-                if (temp) {
-                    return false;
-                }
-            }
-        }
-
-        if (aDecreaseStacksizeBySuccess) {
-            if (givenFluidInputs != null) {
-                for (FluidStack tFluid : requiredFluidInputs) {
-                    if (tFluid != null) {
-                        amt = tFluid.amount;
-                        for (FluidStack aFluid : givenFluidInputs) {
-                            if (aFluid != null && aFluid.isFluidEqual(tFluid)) {
-                                if (aDontCheckStackSizes) {
-                                    aFluid.amount -= amt;
-                                    break;
-                                }
-                                if (aFluid.amount < amt) {
-                                    amt -= aFluid.amount;
-                                    aFluid.amount = 0;
-                                } else {
-                                    aFluid.amount -= amt;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (givenInputs != null) {
-                for (ItemStack tStack : requiredInputs) {
-                    if (tStack != null) {
-                        amt = tStack.stackSize;
-                        for (ItemStack aStack : givenInputs) {
-                            if (GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) {
-                                if (aDontCheckStackSizes) {
-                                    aStack.stackSize -= amt;
-                                    break;
-                                }
-                                if (aStack.stackSize < amt) {
-                                    amt -= aStack.stackSize;
-                                    aStack.stackSize = 0;
-                                } else {
-                                    aStack.stackSize -= amt;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-
-    public static String getUniqueIdentifier(ItemStack is) {
-        return GameRegistry.findUniqueIdentifierFor(is.getItem()).modId + ':' + is.getUnlocalizedName();
-    }
-
-    public static byte getTier(long l) {
-        byte b = -1;
-
-        do {
-            ++b;
-            if (b >= CommonValues.V.length) {
-                return b;
-            }
-        } while (l > CommonValues.V[b]);
-
-        return b;
-    }
-
-    public static String[] splitButDifferent(String string, String delimiter) {
-        String[] strings = new String[StringUtils.countMatches(string, delimiter) + 1];
-        int lastEnd = 0;
-        for (int i = 0; i < strings.length - 1; i++) {
-            int nextEnd = string.indexOf(delimiter, lastEnd);
-            strings[i] = string.substring(lastEnd, nextEnd);
-            lastEnd = nextEnd + delimiter.length();
-        }
-        strings[strings.length - 1] = string.substring(lastEnd);
-        return strings;
-    }
-
-    public static String[] infoFromNBT(NBTTagCompound nbt) {
-        String[] strings = new String[nbt.getInteger("i")];
-        for (int i = 0; i < strings.length; i++) {
-            strings[i] = nbt.getString(Integer.toString(i));
-        }
-        return strings;
-    }
-
-    public static boolean areBitsSet(int setBits, int testedValue) {
-        return (testedValue & setBits) == setBits;
-    }
-
-    public static class ItemStack_NoNBT implements Comparable<ItemStack_NoNBT> {
-        public final Item mItem;
-        public final int mStackSize;
-        public final int mMetaData;
-
-        public ItemStack_NoNBT(Item aItem, long aStackSize, long aMetaData) {
-            this.mItem = aItem;
-            this.mStackSize = (byte) ((int) aStackSize);
-            this.mMetaData = (short) ((int) aMetaData);
-        }
-
-        public ItemStack_NoNBT(ItemStack aStack) {
-            if (aStack == null) {
-                mItem = null;
-                mStackSize = mMetaData = 0;
-            } else {
-                mItem = aStack.getItem();
-                mStackSize = aStack.stackSize;
-                mMetaData = Items.feather.getDamage(aStack);
-            }
-        }
-
-        @Override
-        public int compareTo(ItemStack_NoNBT o) {
-            if (mMetaData > o.mMetaData) return 1;
-            if (mMetaData < o.mMetaData) return -1;
-            if (mStackSize > o.mStackSize) return 1;
-            if (mStackSize < o.mStackSize) return -1;
-            if (mItem != null && o.mItem != null)
-                return mItem.getUnlocalizedName().compareTo(o.mItem.getUnlocalizedName());
-            if (mItem == null && o.mItem == null) return 0;
-            if (mItem != null) return 1;
-            return -1;
-        }
-
-        @Override
-        public boolean equals(Object aStack) {
-            return aStack == this ||
-                    (aStack instanceof ItemStack_NoNBT &&
-                            ((mItem == ((ItemStack_NoNBT) aStack).mItem) || ((ItemStack_NoNBT) aStack).mItem.getUnlocalizedName().equals(this.mItem.getUnlocalizedName())) &&
-                            ((ItemStack_NoNBT) aStack).mStackSize == this.mStackSize &&
-                            ((ItemStack_NoNBT) aStack).mMetaData == this.mMetaData);
-        }
-
-        @Override
-        public int hashCode() {
-            return (mItem != null ? mItem.getUnlocalizedName().hashCode() : 0) ^ (mMetaData << 16) ^ (mStackSize << 24);
-        }
-
-        @Override
-        public String toString() {
-            return Integer.toString(hashCode()) + ' ' + (mItem == null ? "null" : mItem.getUnlocalizedName()) + ' ' + mMetaData + ' ' + mStackSize;
-        }
-    }
-
-    public static void setTier(int tier,Object me){
-        try{
-            Field field=GT_MetaTileEntity_TieredMachineBlock.class.getField("mTier");
-            field.setAccessible(true);
-            field.set(me,(byte)tier);
-        }catch (Exception e){
-            //e.printStackTrace();
-        }
-    }
-
-    public static StringBuilder receiveString(StringBuilder previousValue, int startIndex, int index, int value){
-        int sizeReq=index-startIndex;
-        if(value==0){
-            previousValue.setLength(Math.min(previousValue.length(),sizeReq));
-        }else {
-            previousValue.setLength(Math.max(previousValue.length(),sizeReq));
-            previousValue.setCharAt(sizeReq,(char)value);
-        }
-        return previousValue;
-    }
-
-    @Deprecated
-    public static double receiveDouble(double previousValue, int startIndex, int index, int value){
-        return Double.longBitsToDouble(receiveLong(Double.doubleToLongBits(previousValue),startIndex,index,value));
-    }
-
-    public static long receiveLong(long previousValue, int startIndex, int index, int value){
-        value &=0xFFFF;
-        switch (index-startIndex){
-            case 0:
-                previousValue&= 0xFFFF_FFFF_FFFF_0000L;
-                previousValue|=value;
-                break;
-            case 1:
-                previousValue&=0xFFFF_FFFF_0000_FFFFL;
-                previousValue|=value<<16;
-                break;
-            case 2:
-                previousValue&=0xFFFF_0000_FFFF_FFFFL;
-                previousValue|=(long)value<<32;
-                break;
-            case 3:
-                previousValue&=0x0000_FFFF_FFFF_FFFFL;
-                previousValue|=(long)value<<48;
-                break;
-        }
-        return previousValue;
-    }
-
-    public static void sendString(StringBuilder string,Container container, ICrafting crafter,int startIndex){
-        for (int i = 0; i < string.length(); i++) {
-            crafter.sendProgressBarUpdate(container,startIndex++,string.charAt(i));
-        }
-        crafter.sendProgressBarUpdate(container,startIndex,0);
-    }
-
-    public static void sendDouble(double value,Container container, ICrafting crafter,int startIndex){
-        sendLong(Double.doubleToLongBits(value),container,crafter,startIndex);
-    }
-
-    public static void sendLong(long value,Container container, ICrafting crafter,int startIndex){
-        crafter.sendProgressBarUpdate(container, startIndex++, (int)(value & 0xFFFFL));
-        crafter.sendProgressBarUpdate(container, startIndex++, (int)((value & 0xFFFF0000L)>>>16));
-        crafter.sendProgressBarUpdate(container, startIndex++, (int)((value & 0xFFFF00000000L)>>>32));
-        crafter.sendProgressBarUpdate(container, startIndex,   (int)((value & 0xFFFF000000000000L)>>>48));
-    }
-
-    @Deprecated
-    public static float receiveFloat(float previousValue, int startIndex, int index, int value){
-        return Float.intBitsToFloat(receiveInteger(Float.floatToIntBits(previousValue),startIndex,index,value));
-    }
-
-    public static int receiveInteger(int previousValue, int startIndex, int index, int value){
-        value &=0xFFFF;
-        switch (index-startIndex){
-            case 0:
-                previousValue&= 0xFFFF_0000;
-                previousValue|=value;
-                break;
-            case 1:
-                previousValue&=0x0000_FFFF;
-                previousValue|=value<<16;
-                break;
-        }
-        return previousValue;
-    }
-
-    public static void sendFloat(float value,Container container, ICrafting crafter,int startIndex){
-        sendInteger(Float.floatToIntBits(value),container,crafter,startIndex);
-    }
-
-    public static void sendInteger(int value,Container container, ICrafting crafter,int startIndex){
-        crafter.sendProgressBarUpdate(container, startIndex++, (int)(value & 0xFFFFL));
-        crafter.sendProgressBarUpdate(container, startIndex, (value & 0xFFFF0000)>>>16);
-    }
-
-    public static String doubleToString(double value){
-        if(value==(long)value){
-            return Long.toString((long)value);
-        }
-        return Double.toString(value);
-    }
-
-    public static boolean checkChunkExist(World world, ChunkCoordIntPair chunk){
-        int x=chunk.getCenterXPos();
-        int z=chunk.getCenterZPosition();
-        return world.checkChunksExist(x, 0, z, x, 0, z);
-    }
-
-    public static NBTTagCompound getPlayerData(UUID uuid1,UUID uuid2,String extension) {
-        try {
-            if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
-                if (uuid1 != null && uuid2!=null) {
-                    IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer().worldServerForDimension(0).getSaveHandler().getSaveHandler();
-                    SaveHandler sh = (SaveHandler)playerNBTManagerObj;
-                    File dir = ObfuscationReflectionHelper.getPrivateValue(SaveHandler.class, sh, new String[]{"playersDirectory", "field_75771_c"});
-                    String id1=uuid1.toString();
-                    NBTTagCompound tagCompound=read(new File(dir, id1 + "."+extension));
-                    if(tagCompound!=null){
-                        return tagCompound;
-                    }
-                    tagCompound=readBackup(new File(dir, id1 + "."+extension+"_bak"));
-                    if(tagCompound!=null){
-                        return tagCompound;
-                    }
-                    String id2=uuid2.toString();
-                    tagCompound=read(new File(dir, id2 + "."+extension));
-                    if(tagCompound!=null){
-                        return tagCompound;
-                    }
-                    tagCompound=readBackup(new File(dir, id2 + "."+extension+"_bak"));
-                    if(tagCompound!=null){
-                        return tagCompound;
-                    }
-                }
-            }
-        } catch (Exception ignored) {}
-        return new NBTTagCompound();
-    }
-
-    public static void savePlayerFile(EntityPlayer player,String extension, NBTTagCompound data) {
-        try {
-            if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
-                if (player != null) {
-                    IPlayerFileData playerNBTManagerObj = MinecraftServer.getServer().worldServerForDimension(0).getSaveHandler().getSaveHandler();
-                    SaveHandler sh = (SaveHandler)playerNBTManagerObj;
-                    File dir = ObfuscationReflectionHelper.getPrivateValue(SaveHandler.class, sh, new String[]{"playersDirectory", "field_75771_c"});
-                    String id1=player.getUniqueID().toString();
-                    write(new File(dir, id1 + "."+extension),data);
-                    write(new File(dir, id1 + "."+extension+"_bak"),data);
-                    String id2=UUID.nameUUIDFromBytes(player.getCommandSenderName().getBytes(StandardCharsets.UTF_8)).toString();
-                    write(new File(dir, id2 + "."+extension),data);
-                    write(new File(dir, id2 + "."+extension+"_bak"),data);
-                }
-            }
-        } catch (Exception ignored) {}
-    }
-
-    private static NBTTagCompound read(File file){
-        if (file != null && file.exists()) {
-            try(FileInputStream fileInputStream= new FileInputStream(file)) {
-                return CompressedStreamTools.readCompressed(fileInputStream);
-            } catch (Exception var9) {
-                TecTech.LOGGER.error("Cannot read NBT File: "+file.getAbsolutePath());
-            }
-        }
-        return null;
-    }
-
-    private static NBTTagCompound readBackup(File file){
-        if (file != null && file.exists()) {
-            try(FileInputStream fileInputStream= new FileInputStream(file)) {
-                return CompressedStreamTools.readCompressed(fileInputStream);
-            } catch (Exception var9) {
-                TecTech.LOGGER.error("Cannot read NBT File: "+file.getAbsolutePath());
-                return new NBTTagCompound();
-            }
-        }
-        return null;
-    }
-
-    private static void write(File file,NBTTagCompound tagCompound){
-        if (file != null) {
-            if(tagCompound==null){
-                if(file.exists()) file.delete();
-            }else {
-                try(FileOutputStream fileOutputStream= new FileOutputStream(file)) {
-                    CompressedStreamTools.writeCompressed(tagCompound,fileOutputStream);
-                } catch (Exception var9) {
-                    TecTech.LOGGER.error("Cannot write NBT File: "+file.getAbsolutePath());
-                }
-            }
-        }
-    }
-
-    public static AxisAlignedBB fromChunkCoordIntPair(ChunkCoordIntPair chunkCoordIntPair){
-        int x=chunkCoordIntPair.chunkXPos<<4;
-        int z=chunkCoordIntPair.chunkZPos<<4;
-        return AxisAlignedBB.getBoundingBox(x,-128,z,x+16,512,z+16);
-    }
-
-    public static AxisAlignedBB fromChunk(Chunk chunk){
-        int x=chunk.xPosition<<4;
-        int z=chunk.zPosition<<4;
-        return AxisAlignedBB.getBoundingBox(x,-128,z,x+16,512,z+16);
-    }
-
-    public static String getConcated(String[] strings,String separator){
-        StringBuilder stringBuilder = new StringBuilder();
-        for (String string : strings) {
-            stringBuilder.append(string).append(separator);
-        }
-        int length = stringBuilder.length();
-        if(length >=separator.length()){
-            stringBuilder.setLength(length -separator.length());
-        }
-        return stringBuilder.toString();
-    }
-
-    public static double getMagnitude3D(double in[])
-    {
-        return Math.sqrt(in[0]*in[0]+in[1]*in[1]+in[2]*in[2]);
-    }
-
-    public static void normalize3D(double in[], double out[])
-    {
-        double mag=getMagnitude3D(in);
-        out[0]=in[0]/mag;
-        out[1]=in[1]/mag;
-        out[2]=in[2]/mag;
-    }
-
-    public static void crossProduct3D(double inA[], double inB[], double out[])
-    {
-        out[0] = inA[1] * inB[2] - inA[2] * inB[1];
-        out[1] = inA[2] * inB[0] - inA[0] * inB[2];
-        out[2] = inA[0] * inB[1] - inA[1] * inB[0];
-    }
-}
diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index 79c46b07a2..f9ab756696 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -865,6 +865,7 @@ tt.keyphrase.Average_IO_(max)=Voltage I/O (max)
 tt.keyphrase.Average_IO_max=Voltage I/O max
 tt.keyphrase.Amperage_IO_(max)=Amperage I/O (max)
 tt.keyphrase.Side_capabilities=Side capabilities
+tt.keyphrase.Ass_line_recipe=Assembly Line Recipe
 
 #OpenTurrets compatibility
 tile.turretHeadEM.name=Elemental Matter Turret
@@ -873,6 +874,8 @@ tile.turretBaseEM.name=Elemental Turret Base
 tt.keyword.mol=mol
 tt.keyword.itemMols=items
 tt.keyword.mbMols=mb
+#that the thing wont decay
+tt.keyword.stable=STABLE
 #EM types
 tt.keyword.Primitive=Primitive
 tt.keyword.Element=Element
-- 
cgit