diff --git a/IGP/Pages/DataTables/DataTablesPage.razor b/IGP/Pages/DataTables/DataTablesPage.razor
index 6097c3c..3737fbc 100644
--- a/IGP/Pages/DataTables/DataTablesPage.razor
+++ b/IGP/Pages/DataTables/DataTablesPage.razor
@@ -7,7 +7,22 @@
 <LayoutMediumContentComponent>
     <WebsiteTitleComponent>Data Tables</WebsiteTitleComponent>
 
-    <WeaponTable/>
+    
+    <MudTabs Elevation="2" >
+        <MudTabPanel Text="Attacks">
+            <WeaponTable/>
+        </MudTabPanel>
+        <MudTabPanel Text="Production">
+            <ProductionTable/>
+        </MudTabPanel>
+        <MudTabPanel Text="Health">
+            <VitalityTable/>
+        </MudTabPanel>
+        <MudTabPanel Text="Movement">
+            <MovementTable/>
+        </MudTabPanel>
+    </MudTabs>
+    
 
     <ContentDividerComponent></ContentDividerComponent>
 
diff --git a/IGP/Pages/DataTables/Parts/MovementTable.razor b/IGP/Pages/DataTables/Parts/MovementTable.razor
new file mode 100644
index 0000000..7268247
--- /dev/null
+++ b/IGP/Pages/DataTables/Parts/MovementTable.razor
@@ -0,0 +1,19 @@
+<MudDataGrid T="EntityMovementModel" Items="@_data" 
+             SortMode="SortMode.Multiple" 
+             Filterable="true"
+             Hideable="true">
+    <Columns>
+        <PropertyColumn Property="x => x.Parent.GetName()" Title="Entity"/>
+        <PropertyColumn Property="x => x.Movement"/>
+        <PropertyColumn Property="x => x.Speed" />
+        <PropertyColumn Property="x => x.Parent.GetFaction()" Title="Faction"/>
+        <PropertyColumn Property="x => x.Parent.GetImmortal()" Title="Immortal"/>
+    </Columns>
+</MudDataGrid>
+
+@code {
+    IEnumerable<EntityMovementModel> _data = DATA.Get()
+        .SelectMany(e => e.Value.EntityParts)
+        .OfType<EntityMovementModel>()
+        .ToList();
+}
\ No newline at end of file
diff --git a/IGP/Pages/DataTables/Parts/ProductionTable.razor b/IGP/Pages/DataTables/Parts/ProductionTable.razor
new file mode 100644
index 0000000..465e2ab
--- /dev/null
+++ b/IGP/Pages/DataTables/Parts/ProductionTable.razor
@@ -0,0 +1,21 @@
+<MudDataGrid T="EntityProductionModel" Items="@data" 
+             SortMode="SortMode.Multiple" 
+             Filterable="true"
+             Hideable="true">
+    <Columns>
+        <PropertyColumn Property="x => x.Parent.GetName()" Title="Entity"/>
+        <PropertyColumn Property="x => x.Alloy"/>
+        <PropertyColumn Property="x => x.BuildTime"/>
+        <PropertyColumn Property="x => x.Ether"/>
+        <PropertyColumn Property="x => x.Parent.GetFaction()" Title="Faction"/>
+        <PropertyColumn Property="x => x.Parent.GetImmortal()" Title="Immortal"/>
+    </Columns>
+</MudDataGrid>
+
+@code {
+
+    readonly IEnumerable<EntityProductionModel> data = DATA.Get()
+        .SelectMany(e => e.Value.EntityParts)
+        .OfType<EntityProductionModel>()
+        .ToList();
+}
\ No newline at end of file
diff --git a/IGP/Pages/DataTables/Parts/UnitTable.razor b/IGP/Pages/DataTables/Parts/UnitTable.razor
deleted file mode 100644
index d4a1c63..0000000
--- a/IGP/Pages/DataTables/Parts/UnitTable.razor
+++ /dev/null
@@ -1,5 +0,0 @@
-<h3>UnitTable</h3>
-
-@code {
-
-}
\ No newline at end of file
diff --git a/IGP/Pages/DataTables/Parts/VitalityTable.razor b/IGP/Pages/DataTables/Parts/VitalityTable.razor
new file mode 100644
index 0000000..b60540a
--- /dev/null
+++ b/IGP/Pages/DataTables/Parts/VitalityTable.razor
@@ -0,0 +1,23 @@
+<MudDataGrid T="EntityVitalityModel" Items="@_data" 
+             SortMode="SortMode.Multiple" 
+             Filterable="true"
+             Hideable="true">
+    <Columns>
+        <PropertyColumn Property="x => x.Parent.GetName()" Title="Entity"/>
+        <PropertyColumn Property="x => x.Health"/>
+        <PropertyColumn Property="x => x.Armor" />
+        <PropertyColumn Property="x => x.Defense" />
+        <PropertyColumn Property="x => x.DefenseLayer" />
+        <PropertyColumn Property="x => x.IsStructure" />
+        <PropertyColumn Property="x => x.IsEtheric" />
+        <PropertyColumn Property="x => x.Parent.GetFaction()" Title="Faction"/>
+        <PropertyColumn Property="x => x.Parent.GetImmortal()" Title="Immortal"/>
+    </Columns>
+</MudDataGrid>
+
+@code {
+    IEnumerable<EntityVitalityModel> _data = DATA.Get()
+        .SelectMany(e => e.Value.EntityParts)
+        .OfType<EntityVitalityModel>()
+        .ToList();
+}
\ No newline at end of file
diff --git a/IGP/Pages/DataTables/Parts/WeaponTable.razor b/IGP/Pages/DataTables/Parts/WeaponTable.razor
index b546c0a..3ec7c4a 100644
--- a/IGP/Pages/DataTables/Parts/WeaponTable.razor
+++ b/IGP/Pages/DataTables/Parts/WeaponTable.razor
@@ -1,11 +1,9 @@
-<h3>WeaponTable</h3>
-
-
-<MudDataGrid T="EntityWeaponModel" Items="@_entityWeapons" 
+<MudDataGrid T="EntityWeaponModel" Items="@_data" 
              SortMode="SortMode.Multiple" 
              Filterable="true"
              Hideable="true">
     <Columns>
+        <PropertyColumn Property="x => x.Parent.GetName()" Title="Entity"/>
         <PropertyColumn Property="x => x.Range" Title="Range"/>
         <PropertyColumn Property="x => x.Damage" Title="Damage"/>
         <PropertyColumn Property="x => x.AttacksPerSecond" Title="Attacks Per Second"/>
@@ -13,17 +11,13 @@
         <PropertyColumn Property="x => x.DamagePerSecondLight()" Title="DPS (Light)"/>
         <PropertyColumn Property="x => x.DamagePerSecondMedium()" Title="DPS (Medium)"/>
         <PropertyColumn Property="x => x.DamagePerSecondHeavy()" Title="DPS (Heavy)"/>
-        <PropertyColumn Property="x => x.Parent.GetName()" Title="Owner Name"/>
         <PropertyColumn Property="x => x.Parent.GetFaction()" Title="Faction"/>
         <PropertyColumn Property="x => x.Parent.GetImmortal()" Title="Immortal"/>
     </Columns>
-    <PagerContent>
-        <MudDataGridPager T="EntityWeaponModel" />
-    </PagerContent>
 </MudDataGrid>
 
 @code {
-    IEnumerable<EntityWeaponModel> _entityWeapons = DATA.Get()
+    IEnumerable<EntityWeaponModel> _data = DATA.Get()
         .SelectMany(e => e.Value.EntityParts)
         .OfType<EntityWeaponModel>()
         .ToList();
diff --git a/IGP/Program.cs b/IGP/Program.cs
index fdc3376..717ce85 100644
--- a/IGP/Program.cs
+++ b/IGP/Program.cs
@@ -1,6 +1,7 @@
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Blazor.Analytics;
 using Blazored.LocalStorage;
 using IGP;
 using Microsoft.AspNetCore.Components.Web;
@@ -38,6 +39,12 @@ builder.Services.AddBlazoredLocalStorageAsSingleton(config =>
     config.JsonSerializerOptions.WriteIndented = false;
 });
 
+#if DEBUG
+builder.Services.AddGoogleAnalytics("G-S96LW7TVFY");
+#else
+builder.Services.AddGoogleAnalytics(builder.Configuration["GATag"]);
+#endif
+
 builder.Services.AddScoped<INavigationService, NavigationService>();
 builder.Services.AddScoped<IKeyService, KeyService>();
 builder.Services.AddScoped<IImmortalSelectionService, ImmortalSelectionService>();
@@ -73,6 +80,7 @@ builder.Services.AddScoped(sp => new HttpClient
 builder.Services.AddMudServices();
 
 
+
 await builder.Build().RunAsync();