diff --git a/src/com/builtbroken/common/ChemElement.java b/src/com/builtbroken/common/ChemElement.java
new file mode 100644
index 00000000..44d75ceb
--- /dev/null
+++ b/src/com/builtbroken/common/ChemElement.java
@@ -0,0 +1,162 @@
+package com.builtbroken.common;
+
+/** List of element from the periodic table of elements for any kind of use
+ *
+ * @Source http://www.periodictable.com/Properties/A/SpecificHeat.an.html
+ * @source http://www.chemicalelements.com/
+ * @author Robert Seifert */
+public enum ChemElement
+{
+    Hydrogen("Hydrogen", "H", 1.00794f, 0.08988f, 14.009985f, 20.280005f),
+    Helium("Helium", "He", 4.002602f, 0.1785f),
+    Lithium("Lithium", "Li", 6.941f, 0.53f),
+    Beryllium("Beryllium", "Be", 9.012182f, 1.8477f),
+    Boron("Boron", "B"),
+    Carbon("Carbon", "C"),
+    Nitrogen(),
+    Oxygen(),
+    Fluorine(),
+    Neon(),
+    Sodium(),
+    Magnesium(),
+    Aluminium(),
+    Silicon(),
+    Phosphorus(),
+    Sulfur(),
+    Chlorine(),
+    Argon(),
+    Potassium(),
+    Calcium(),
+    Scandium(),
+    Titanium(),
+    Vanadium(),
+    Chromium(),
+    Manganese(),
+    Iron(),
+    Cobalt(),
+    Copper(),
+    Zinc(),
+    Gallium(),
+    Germanium(),
+    Arsenic(),
+    Selenium(),
+    Bromine(),
+    Krypton(),
+    Rubidium(),
+    Strontium(),
+    Yttrium(),
+    Zinconium(),
+    Niobium(),
+    Molybdenum(),
+    Technetium(),
+    Ruthenium(),
+    Rhodium(),
+    Palladium(),
+    Silver(),
+    Cadmium(),
+    Indium(),
+    Tin(),
+    Antimony(),
+    Tellurium(),
+    Iodine(),
+    Xenon(),
+    Caesium(),
+    Harium(),
+    Lanthanum(),
+    Cerium(),
+    Prascodymium(),
+    Neodymium(),
+    Promethium(),
+    Samarium(),
+    Europium(),
+    Gadolinium(),
+    Terbium(),
+    Dysprosium(),
+    Holmium(),
+    Erbium(),
+    Thulium(),
+    Yllcrbium(),
+    Lutelium(),
+    Halnium(),
+    Tantalum(),
+    Tungsten(),
+    Rhenium(),
+    Osmium(),
+    Iridium(),
+    Platinum(),
+    Gold(),
+    Mercury(),
+    Thallium(),
+    Lead(),
+    Bismuth(),
+    Polonium(),
+    Astaline(),
+    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(),
+    Reontgenium(),
+    Copernicium();
+
+    public float specificHeatSolid, specificHeatGas, specificHeatLiquid;
+    /** g/cm^3 */
+    public float density;
+    /** amu */
+    public float atomicMass;
+
+    /** Melting point in kelvin */
+    public float meltingPointKelvin;
+    /** boiling point in kelvin */
+    public float boilignPointKelving;
+
+    public String elementName = "element";
+    public String elementSymbol = "element";
+
+    private ChemElement()
+    {
+
+    }
+
+    private ChemElement(String name, String symbol)
+    {
+        this();
+        this.elementName = name;
+        this.elementSymbol = symbol;
+    }
+
+    private ChemElement(String name, String symbol, float atomicMass, float density)
+    {
+        this(name, symbol);
+        this.atomicMass = atomicMass;
+        this.density = density;
+    }
+
+    private ChemElement(String name, String symbol, float atomicMass, float density, float meltingPointK, float boilingPointK)
+    {
+        this(name, symbol, atomicMass, density);
+        this.meltingPointKelvin = meltingPointK;
+        this.boilignPointKelving = boilingPointK;
+    }
+
+}
diff --git a/src/com/builtbroken/common/Element.java b/src/com/builtbroken/common/Element.java
deleted file mode 100644
index 8d2e21ac..00000000
--- a/src/com/builtbroken/common/Element.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.builtbroken.common;
-
-/** List of element from the periodic table of elements for any kind of use
- *
- * @Source http://www.periodictable.com/Properties/A/SpecificHeat.an.html
- * @source http://www.chemicalelements.com/
- * @author Robert Seifert */
-public enum Element
-{
-    HYDROGEN("Hydrogen", "H", 1.00794f, 14300f, 14.009985f, 14.009985f, 0.08988f, 1, 0);
-
-    public float specificHeat, density, atomicMass;
-
-    private Element()
-    {
-
-    }
-
-    private Element(String name, String symbol, float atomicMass, float specificHeat, float meltingPointK, float frezingPointK, float density, int numberOfProtons, int numberOfNeturons)
-    {
-
-    }
-
-}