diff --git a/.gitignore b/.gitignore
index 80931262..fe2dd1d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ whitelist.json
 src/main/resources/mixins.*.json
 *.bat
 /src/doc/
+/libs/
\ No newline at end of file
diff --git a/dependencies.gradle b/dependencies.gradle
index c81b8cf6..19b06cb4 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -35,4 +35,7 @@ dependencies {
 //    implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.3.0:dev') { transitive = false }
 //    implementation("com.github.GTNewHorizons:Avaritia:1.49:dev") { transitive = false }
 //    implementation("com.github.GTNewHorizons:ForestryMC:4.9.3:dev") { transitive = false }
+
+    // Deps for testing (TE) energy handles
+    //devOnlyNonPublishable(rfg.deobf(fileTree(dir: 'libs/', include: ['*.jar'])))
 }
diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java
index 13b54f38..e5ec5a21 100644
--- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java
+++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java
@@ -1,5 +1,6 @@
 package mcp.mobius.waila.addons.thermalexpansion;
 
+import java.text.NumberFormat;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -15,6 +16,14 @@
 
 public class HUDHandlerEnergyCell implements IWailaDataProvider {
 
+
+    private static final NumberFormat energyFormat = NumberFormat.getInstance();
+    
+    static {
+        energyFormat.setGroupingUsed(true);
+        energyFormat.setMaximumFractionDigits(0);
+    }
+
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
         return null;
@@ -33,14 +42,25 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, I
 
         int energyReceive = accessor.getNBTInteger(accessor.getNBTData(), "Recv");
         int energySend = accessor.getNBTInteger(accessor.getNBTData(), "Send");
-
-        currenttip.add(
+        
+        if (!config.getConfig("thermalexpansion.digitgrouping")) {
+            currenttip.add(
                 String.format(
                         "%s/%s : %d / %d RF/t",
-                        LangUtil.translateG("hud.msg.in"),
-                        LangUtil.translateG("hud.msg.out"),
+                        LangUtil.translateG("hud.msg.input"),
+                        LangUtil.translateG("hud.msg.output"),
                         energyReceive,
                         energySend));
+        } else {
+            currenttip.add(
+                String.format(
+                        "%s/%s : %s / %s RF/t",
+                        LangUtil.translateG("hud.msg.input"),
+                        LangUtil.translateG("hud.msg.output"),
+                        energyFormat.format(energyReceive),
+                        energyFormat.format(energySend)));
+        }
+
 
         return currenttip;
     }
diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java
index 4a6d6ebe..0ddc2b3a 100644
--- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java
+++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java
@@ -1,5 +1,6 @@
 package mcp.mobius.waila.addons.thermalexpansion;
 
+import java.text.NumberFormat;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -17,6 +18,13 @@
 
 public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
 
+    private static final NumberFormat energyFormat = NumberFormat.getInstance();
+    
+    static {
+        energyFormat.setGroupingUsed(true);
+        energyFormat.setMaximumFractionDigits(0);
+    }
+
     @Override
     public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) {
         return null;
@@ -39,12 +47,22 @@ public List<String> getWailaBody(ItemStack itemStack, List<String> currenttip, I
         int maxEnergy = accessor.getNBTInteger(accessor.getNBTData(), "MaxStorage");
         try {
             if ((maxEnergy != 0) && (((ITaggedList) currenttip).getEntries("RFEnergyStorage").size() == 0)) {
-                ((ITaggedList) currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage");
+                if (!config.getConfig("thermalexpansion.digitgrouping")) {
+                    ((ITaggedList) currenttip).add(String.format("%d / %d RF", energy, maxEnergy), "RFEnergyStorage");
+                } else {
+                    ((ITaggedList) currenttip).add(
+                        String.format(
+                            "%s / %s RF", 
+                            energyFormat.format(energy), 
+                            energyFormat.format(maxEnergy)
+                        ), 
+                        "RFEnergyStorage");
+                }
             }
         } catch (Exception e) {
             currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip);
         }
-
+        
         return currenttip;
     }
 
diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java
index 585a48e8..35aaa780 100644
--- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java
+++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java
@@ -67,6 +67,7 @@ public static void register() {
             IEnergyInfo_getCurStorage = IEnergyInfo.getMethod("getInfoEnergyStored");
 
             ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.energyhandler");
+            ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.digitgrouping", false);
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
             ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyProvider);
             ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyReceiver);