diff --git a/Components/Components.csproj b/Components/Components.csproj
index 3dc3012..20de28b 100644
--- a/Components/Components.csproj
+++ b/Components/Components.csproj
@@ -15,24 +15,24 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <SupportedPlatform Include="browser"/>
+        <SupportedPlatform Include="browser" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Markdig" Version="0.28.1"/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0-preview.2.22153.2"/>
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0-preview.2.22153.2"/>
+        <PackageReference Include="Markdig" Version="0.30.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0-preview.3.22178.4" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0-preview.3.22178.4" />
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Inputs\"/>
+        <Folder Include="Inputs\" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Model\Model.csproj"/>
-        <ProjectReference Include="..\Services\Services.csproj"/>
+        <ProjectReference Include="..\Model\Model.csproj" />
+        <ProjectReference Include="..\Services\Services.csproj" />
     </ItemGroup>
     <ItemGroup>
-        <None Remove="Inputs\"/>
+        <None Remove="Inputs\" />
     </ItemGroup>
 </Project>
diff --git a/Contexts/Contexts.csproj b/Contexts/Contexts.csproj
index 3b7c3a0..6f60ec1 100644
--- a/Contexts/Contexts.csproj
+++ b/Contexts/Contexts.csproj
@@ -15,15 +15,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-preview.2.22153.1"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-preview.2.22153.1">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-preview.3.22175.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-preview.3.22175.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Model\Model.csproj"/>
+        <ProjectReference Include="..\Model\Model.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/IGP/Database.db b/IGP/Database.db
index a4b73cf..d62c639 100644
Binary files a/IGP/Database.db and b/IGP/Database.db differ
diff --git a/IGP/IGP.csproj b/IGP/IGP.csproj
index 4282b55..34f686a 100644
--- a/IGP/IGP.csproj
+++ b/IGP/IGP.csproj
@@ -20,10 +20,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Markdig" Version="0.28.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-preview.2.22153.2" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-preview.2.22153.2" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0-preview.2.22153.2" />
+        <PackageReference Include="Markdig" Version="0.30.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-preview.3.22178.4" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-preview.3.22178.4" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0-preview.3.22178.4" />
         <!--
                 <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-preview.2.22153.1" />
                 <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0-preview.2.22153.1" />
diff --git a/IGP/Index.razor b/IGP/Index.razor
index 46b1ffd..84e445d 100644
--- a/IGP/Index.razor
+++ b/IGP/Index.razor
@@ -3,7 +3,7 @@
 @layout PageLayout
 
 <DevOnlyComponent>
-    <HarassCalculatorPage></HarassCalculatorPage>
+    <BuildCalculatorPage></BuildCalculatorPage>
 </DevOnlyComponent>
 
 <HomePage/>
\ No newline at end of file
diff --git a/IGP/Pages/BuildCalculator/Parts/BankComponent.razor b/IGP/Pages/BuildCalculator/Parts/BankComponent.razor
index b044b1f..23a86d7 100644
--- a/IGP/Pages/BuildCalculator/Parts/BankComponent.razor
+++ b/IGP/Pages/BuildCalculator/Parts/BankComponent.razor
@@ -11,18 +11,18 @@
     </FormDisplayComponent>
     <div class="bankRow">
         <FormDisplayComponent Label="Alloy">
-            <Display>@economy.Alloy</Display>
+            <Display>@_economy.Alloy</Display>
         </FormDisplayComponent>
         <FormDisplayComponent Label="Ether">
-            <Display>@economy.Ether</Display>
+            <Display>@_economy.Ether</Display>
         </FormDisplayComponent>
     </div>
     <div class="bankRow">
         <FormDisplayComponent Label="Pyre">
-            <Display>@economy.Pyre</Display>
+            <Display>@_economy.Pyre</Display>
         </FormDisplayComponent>
         <FormDisplayComponent Label="Supply">
-            <Display>@supplyTaken / @supplyGranted (@(supplyGranted / 16)@(extraBuildings > 0 ? "+" + extraBuildings : ""))</Display>
+            <Display>@_supplyTaken / @_supplyGranted (@(_supplyGranted / 16)@(_extraBuildings > 0 ? "+" + _extraBuildings : ""))</Display>
         </FormDisplayComponent>
     </div>
 
@@ -30,13 +30,13 @@
         <div class="workerText">Workers</div>
         <div class="bankRow">
             <FormDisplayComponent Label="Current">
-                <Display>@economy.WorkerCount</Display>
+                <Display>@_economy.WorkerCount</Display>
             </FormDisplayComponent>
             <FormDisplayComponent Label="Busy">
-                <Display>@economy.BusyWorkerCount</Display>
+                <Display>@_economy.BusyWorkerCount</Display>
             </FormDisplayComponent>
             <FormDisplayComponent Label="Creating">
-                <Display>@economy.CreatingWorkerCount</Display>
+                <Display>@_economy.CreatingWorkerCount</Display>
             </FormDisplayComponent>
         </div>
     </div>
@@ -68,10 +68,10 @@
     [Inject]
     IEconomyService EconomyService { get; set; } = default!;
 
-    EconomyModel economy = new();
-    int supplyGranted;
-    int supplyTaken;
-    int extraBuildings;
+    EconomyModel _economy = new();
+    int _supplyGranted;
+    int _supplyTaken;
+    int _extraBuildings;
 
     protected override void OnInitialized()
     {
@@ -101,27 +101,27 @@
 
     void OnBuildOrderChanged()
     {
-        economy = EconomyService.GetEconomy(BuildOrderService.GetLastRequestInterval());
+        _economy = EconomyService.GetEconomy(BuildOrderService.GetLastRequestInterval());
 
         var ordersOverTime = BuildOrderService.GetOrders();
 
-        supplyTaken = (from ordersAtInterval in ordersOverTime
+        _supplyTaken = (from ordersAtInterval in ordersOverTime
             from order in ordersAtInterval.Value
             where order.Supply() != null
             where order.Supply().Takes > 0
             select order.Supply().Takes).Sum();
 
-        supplyGranted = (from ordersAtInterval in ordersOverTime
+        _supplyGranted = (from ordersAtInterval in ordersOverTime
             from order in ordersAtInterval.Value
             where order.Supply() != null
             where order.Supply().Grants > 0
             select order.Supply().Grants).Sum();
 
-        extraBuildings = 0;
-        if (supplyGranted > 160)
+        _extraBuildings = 0;
+        if (_supplyGranted > 160)
         {
-            extraBuildings = (supplyGranted - 160) / 16;
-            supplyGranted = 160;
+            _extraBuildings = (_supplyGranted - 160) / 16;
+            _supplyGranted = 160;
         }
 
 
diff --git a/IGP/Pages/EconomyComparison/EconomyComparisonPage.razor b/IGP/Pages/EconomyComparison/EconomyComparisonPage.razor
index 966502a..8564799 100644
--- a/IGP/Pages/EconomyComparison/EconomyComparisonPage.razor
+++ b/IGP/Pages/EconomyComparison/EconomyComparisonPage.razor
@@ -1,49 +1,10 @@
 @page "/economy-comparison"
 
 @implements IDisposable
-@inject IEconomyComparisonService economyComparisonService
+@inject IEconomyComparisonService EconomyComparisonService
 @layout PageLayout
 
-
 <LayoutMediumContentComponent>
-  
-    <AlertComponent Type="@SeverityType.Error">
-        <Title>Contains Bugs</Title>
-        <Message>None of these calculations and results have been verified. Use with caution. </Message>
-    </AlertComponent>
-    
-    <DevOnlyComponent>
-        @foreach (var buildToCompare in economyComparisonService.BuildsToCompare)
-        {
-            foreach (var ordersAtTime in buildToCompare.BuildOrderModel.StartedOrders)
-            {
-                foreach (var order in ordersAtTime.Value)
-                {
-                    <div>@ordersAtTime.Key - @order.Info().Name</div>
-                }
-            }
-            
-        }
-        
-        @{
-            float alloyHighest = 0;
-        }
-        @foreach (var buildToCompare in economyComparisonService.BuildsToCompare)
-                {
-                    foreach (var economy in buildToCompare.EconomyOverTimeModel)
-                    {
-                        if (economy.Alloy > alloyHighest)
-                        {
-                            alloyHighest = economy.Alloy;
-                        }
-                    }
-                    
-                }
-        
-        <div>@alloyHighest</div>
-        
-    </DevOnlyComponent>
-
     <PaperComponent>
         <div>You</div>
         <EconomyInputComponent ForPlayer="0"/>
@@ -65,7 +26,6 @@
     <ContentDividerComponent/>
 
     <PaperComponent>
-
         <InfoBodyComponent>
             <InfoQuestionComponent>
                 What is this tool for?
@@ -78,18 +38,13 @@
 </LayoutMediumContentComponent>
 
 @code {
-
-    
     protected override void OnInitialized()
     {
-        economyComparisonService.Subscribe(StateHasChanged);
-
+        EconomyComparisonService.Subscribe(StateHasChanged);
     }
 
-
     void IDisposable.Dispose()
     {
-        economyComparisonService.Unsubscribe(StateHasChanged);
+        EconomyComparisonService.Unsubscribe(StateHasChanged);
     }
-
 }
\ No newline at end of file
diff --git a/IGP/wwwroot/generated/AgileTaskModels.json b/IGP/wwwroot/generated/AgileTaskModels.json
index 0eb02c5..34c688d 100644
--- a/IGP/wwwroot/generated/AgileTaskModels.json
+++ b/IGP/wwwroot/generated/AgileTaskModels.json
@@ -1 +1 @@
-[{"Id":1,"AgileSprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"AgileSprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"AgileSprintModelId":5,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":4,"AgileSprintModelId":5,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-13T00:00:00"},{"Id":5,"AgileSprintModelId":5,"Name":"Change Attack Timing Interval","Description":"Be able to set attack timing.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-15T00:00:00"},{"Id":6,"AgileSprintModelId":5,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":7,"AgileSprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"AgileSprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds.  How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"AgileSprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"AgileSprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"AgileSprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"AgileSprintModelId":4,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Ended up not using exact Yaml. Button in Database controls Detailed vs Plain display ","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":13,"AgileSprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"AgileSprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"AgileSprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"AgileSprintModelId":5,"Name":"Multiple Travel Time in Harass Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Done","Priority":"Low","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":17,"AgileSprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"AgileSprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","OrderPriority":5,"Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"AgileSprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"AgileSprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"AgileSprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"AgileSprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"AgileSprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"AgileSprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"AgileSprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"AgileSprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"AgileSprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"AgileSprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"AgileSprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"AgileSprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"AgileSprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"AgileSprintModelId":6,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"AgileSprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"AgileSprintModelId":4,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-09T00:00:00"},{"Id":35,"AgileSprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"AgileSprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"AgileSprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"AgileSprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":39,"AgileSprintModelId":4,"Name":"Refresh Database Bug","Description":"Database dialog UI isn\u0027t refreshing enough","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":40,"AgileSprintModelId":4,"Name":"Branding Stuff","Description":"Add a schedule, improving branding, etc, ","Notes":"Only improved Twitch overlays","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":41,"AgileSprintModelId":4,"Name":"Improve Documents/Notes UI","Description":"Should have a left navigation menu. And prev/next buttons","Notes":"Updated UI. Will added prev/next and breadcrumbs later","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-05T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":42,"AgileSprintModelId":5,"Name":"Add GitHub links instead of showing code","Description":"For all code examples","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-14T00:00:00"},{"Id":43,"AgileSprintModelId":5,"Name":"Research More used RTS calculations","Description":"What other calculators like the Harass Page can be added","Notes":"Do amount of hits to kill, between two units. Maybe time to regen spell uses","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-14T00:00:00"},{"Id":44,"AgileSprintModelId":5,"Name":"Add Error Toasts to Calculator","Description":"Not enough \u0022Ether\u0022","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-12T00:00:00"},{"Id":45,"AgileSprintModelId":5,"Name":"Handle Divide by Zero in Harass Calculator","Description":"addDescription","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":46,"AgileSprintModelId":5,"Name":"Harass Calculator first client experience","Description":"Navigate player though the harass calculator steps","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":47,"AgileSprintModelId":5,"Name":"Training Queue","Description":"Add training queue times to the build calculator","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":48,"AgileSprintModelId":5,"Name":"Refresh Button for Build Calculator","Description":"Refresh to regenerate timeline and charts","Notes":"Adding a loading screen for charts. Remove redundant renders","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-13T00:00:00"},{"Id":49,"AgileSprintModelId":5,"Name":"Gameplay Warning State Toasts","Description":"\u0022You should upgrade your economy.\u0022 \u0022Your using too much ether, spend alloy\u0022","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":50,"AgileSprintModelId":5,"Name":"Make desktop navigation buttons","Description":"It popping up all the time is a tad tedious","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-12T00:00:00"},{"Id":51,"AgileSprintModelId":5,"Name":"Working Timers","Description":"Toast dismiss timers not making sense. Look into proper Timers","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-13T00:00:00"},{"Id":52,"AgileSprintModelId":5,"Name":"Clean up Build Calculator code","Description":"Code needs to be easily readable so it can be updated, maintained, and optimized","Notes":"addNotes","Status":"In_Progress","Priority":"Medium","Task":"Feature","OrderPriority":1,"Created":"2022-04-12T00:00:00","Finished":null},{"Id":53,"AgileSprintModelId":0,"Name":"Armor Types","Description":"Explain Light, Medium and Heavy armor types, and damage works","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":54,"AgileSprintModelId":0,"Name":"Economy Overview","Description":"How long it takes bases to mine out. How good natruals area","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":55,"AgileSprintModelId":0,"Name":"Timing and Scouting","Description":"Attacking and reacting to what the enemy is doing","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":56,"AgileSprintModelId":0,"Name":"Families, Factions, and Immortal Vanguards","Description":"How factions could be viewed.","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":57,"AgileSprintModelId":0,"Name":"Immortals Spells and Pyre","Description":"Using your Immortal","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":58,"AgileSprintModelId":null,"Name":"Organize Sprint Order","Description":"Sprints should be ordered as, current sprint, previous sprint, backlog, easy tasks, future sprints, old sprints","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":59,"AgileSprintModelId":5,"Name":"Better Sorting Algorithms ","Description":"Be smarted with searching through and sorting lists","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":60,"AgileSprintModelId":6,"Name":"Settings Section","Description":"Add a settings area, for permission and cookie related content","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":61,"AgileSprintModelId":6,"Name":"Analytics","Description":"Track client going to each page.","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":62,"AgileSprintModelId":6,"Name":"Cookies","Description":"Cookies to remember a the client permission options ","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":63,"AgileSprintModelId":6,"Name":"Permission Controls Page","Description":"Allow clients to enable cookies, analytics, and perhaps make things more granular. ","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":64,"AgileSprintModelId":6,"Name":"Defaults Page","Description":"Let clients set a cookie for Plain/Detailed view. Perhaps default Immortal. Etc.","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":65,"AgileSprintModelId":6,"Name":"Analytics Page","Description":"Let\u0027s have a page that shows the analytics collected during a client\u0027s session","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":66,"AgileSprintModelId":5,"Name":"Economy Comparison","Description":"Compare different economies. Make this a page under resources","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-15T00:00:00","Finished":"2022-04-17T00:00:00"},{"Id":67,"AgileSprintModelId":5,"Name":"[Ctrl \u002B K] Search feature","Description":"WIP. Needs polish","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-16T00:00:00","Finished":"2022-04-16T00:00:00"},{"Id":68,"AgileSprintModelId":6,"Name":"Lighthouse Score","Description":"Lighthouse score is awful. Try to get to the green","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-16T00:00:00","Finished":null},{"Id":69,"AgileSprintModelId":6,"Name":"SEO","Description":"People might be trying to google this website instead of bookmarking it. Make sure its googleable","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-17T00:00:00","Finished":null},{"Id":70,"AgileSprintModelId":6,"Name":"AttacksPerSecond Format Setting","Description":"Make SunSpear\u0027s DPS formatting the default, and allow people to turn it off in settings, for people that don\u0027t like the SBA/APS swapping","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-17T00:00:00","Finished":null},{"Id":71,"AgileSprintModelId":5,"Name":"Fix Cancel Button Giving Money","Description":"Things can be built faster if you cancel","Notes":"addNotes","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-17T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":72,"AgileSprintModelId":5,"Name":"Calculations Change Answers Over Time","Description":"Obviously a bug in the calculation logic","Notes":"addNotes","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-17T00:00:00","Finished":"2022-04-18T00:00:00"}]
\ No newline at end of file
+[{"Id":1,"AgileSprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"AgileSprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"AgileSprintModelId":5,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":4,"AgileSprintModelId":5,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-13T00:00:00"},{"Id":5,"AgileSprintModelId":5,"Name":"Change Attack Timing Interval","Description":"Be able to set attack timing.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-15T00:00:00"},{"Id":6,"AgileSprintModelId":5,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":7,"AgileSprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"AgileSprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds.  How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"AgileSprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"AgileSprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"AgileSprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"AgileSprintModelId":4,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Ended up not using exact Yaml. Button in Database controls Detailed vs Plain display ","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":13,"AgileSprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"AgileSprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"AgileSprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"AgileSprintModelId":5,"Name":"Multiple Travel Time in Harass Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Done","Priority":"Low","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":17,"AgileSprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","OrderPriority":3,"Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"AgileSprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","OrderPriority":5,"Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"AgileSprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"AgileSprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"AgileSprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"AgileSprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"AgileSprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"AgileSprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"AgileSprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"AgileSprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"AgileSprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"AgileSprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"AgileSprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"AgileSprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"AgileSprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"AgileSprintModelId":6,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"AgileSprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","OrderPriority":2,"Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"AgileSprintModelId":4,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-09T00:00:00"},{"Id":35,"AgileSprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"AgileSprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"AgileSprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"AgileSprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":39,"AgileSprintModelId":4,"Name":"Refresh Database Bug","Description":"Database dialog UI isn\u0027t refreshing enough","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":40,"AgileSprintModelId":4,"Name":"Branding Stuff","Description":"Add a schedule, improving branding, etc, ","Notes":"Only improved Twitch overlays","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-03T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":41,"AgileSprintModelId":4,"Name":"Improve Documents/Notes UI","Description":"Should have a left navigation menu. And prev/next buttons","Notes":"Updated UI. Will added prev/next and breadcrumbs later","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-05T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":42,"AgileSprintModelId":5,"Name":"Add GitHub links instead of showing code","Description":"For all code examples","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-14T00:00:00"},{"Id":43,"AgileSprintModelId":5,"Name":"Research More used RTS calculations","Description":"What other calculators like the Harass Page can be added","Notes":"Do amount of hits to kill, between two units. Maybe time to regen spell uses","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-14T00:00:00"},{"Id":44,"AgileSprintModelId":5,"Name":"Add Error Toasts to Calculator","Description":"Not enough \u0022Ether\u0022","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-12T00:00:00"},{"Id":45,"AgileSprintModelId":5,"Name":"Handle Divide by Zero in Harass Calculator","Description":"addDescription","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":46,"AgileSprintModelId":null,"Name":"Harass Calculator first client experience","Description":"Navigate player though the harass calculator steps","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":47,"AgileSprintModelId":null,"Name":"Training Queue","Description":"Add training queue times to the build calculator","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":48,"AgileSprintModelId":5,"Name":"Refresh Button for Build Calculator","Description":"Refresh to regenerate timeline and charts","Notes":"Adding a loading screen for charts. Remove redundant renders","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-13T00:00:00"},{"Id":49,"AgileSprintModelId":null,"Name":"Gameplay Warning State Toasts","Description":"\u0022You should upgrade your economy.\u0022 \u0022Your using too much ether, spend alloy\u0022","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-10T00:00:00","Finished":null},{"Id":50,"AgileSprintModelId":5,"Name":"Make desktop navigation buttons","Description":"It popping up all the time is a tad tedious","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-12T00:00:00"},{"Id":51,"AgileSprintModelId":5,"Name":"Working Timers","Description":"Toast dismiss timers not making sense. Look into proper Timers","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-10T00:00:00","Finished":"2022-04-13T00:00:00"},{"Id":52,"AgileSprintModelId":5,"Name":"Clean up Build Calculator code","Description":"Code needs to be easily readable so it can be updated, maintained, and optimized","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-12T00:00:00","Finished":null},{"Id":53,"AgileSprintModelId":0,"Name":"Armor Types","Description":"Explain Light, Medium and Heavy armor types, and damage works","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":54,"AgileSprintModelId":0,"Name":"Economy Overview","Description":"How long it takes bases to mine out. How good natruals area","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":55,"AgileSprintModelId":0,"Name":"Timing and Scouting","Description":"Attacking and reacting to what the enemy is doing","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":56,"AgileSprintModelId":0,"Name":"Families, Factions, and Immortal Vanguards","Description":"How factions could be viewed.","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":57,"AgileSprintModelId":0,"Name":"Immortals Spells and Pyre","Description":"Using your Immortal","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Document","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":58,"AgileSprintModelId":null,"Name":"Organize Sprint Order","Description":"Sprints should be ordered as, current sprint, previous sprint, backlog, easy tasks, future sprints, old sprints","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":59,"AgileSprintModelId":null,"Name":"Better Sorting Algorithms ","Description":"Be smarted with searching through and sorting lists","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-13T00:00:00","Finished":null},{"Id":60,"AgileSprintModelId":6,"Name":"Settings Section","Description":"Add a settings area, for permission and cookie related content","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":61,"AgileSprintModelId":6,"Name":"Analytics","Description":"Track client going to each page.","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":62,"AgileSprintModelId":6,"Name":"Cookies","Description":"Cookies to remember a the client permission options ","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":63,"AgileSprintModelId":6,"Name":"Permission Controls Page","Description":"Allow clients to enable cookies, analytics, and perhaps make things more granular. ","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":64,"AgileSprintModelId":6,"Name":"Defaults Page","Description":"Let clients set a cookie for Plain/Detailed view. Perhaps default Immortal. Etc.","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":65,"AgileSprintModelId":6,"Name":"Analytics Page","Description":"Let\u0027s have a page that shows the analytics collected during a client\u0027s session","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-14T00:00:00","Finished":null},{"Id":66,"AgileSprintModelId":5,"Name":"Economy Comparison","Description":"Compare different economies. Make this a page under resources","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-15T00:00:00","Finished":"2022-04-17T00:00:00"},{"Id":67,"AgileSprintModelId":5,"Name":"[Ctrl \u002B K] Search feature","Description":"WIP. Needs polish","Notes":"addNotes","Status":"Done","Priority":"Medium","Task":"Feature","OrderPriority":3,"Created":"2022-04-16T00:00:00","Finished":"2022-04-16T00:00:00"},{"Id":68,"AgileSprintModelId":6,"Name":"Lighthouse Score","Description":"Lighthouse score is awful. Try to get to the green","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-16T00:00:00","Finished":null},{"Id":69,"AgileSprintModelId":6,"Name":"SEO","Description":"People might be trying to google this website instead of bookmarking it. Make sure its googleable","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-17T00:00:00","Finished":null},{"Id":70,"AgileSprintModelId":6,"Name":"AttacksPerSecond Format Setting","Description":"Make SunSpear\u0027s DPS formatting the default, and allow people to turn it off in settings, for people that don\u0027t like the SBA/APS swapping","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","OrderPriority":2,"Created":"2022-04-17T00:00:00","Finished":null},{"Id":71,"AgileSprintModelId":5,"Name":"Fix Cancel Button Giving Money","Description":"Things can be built faster if you cancel","Notes":"addNotes","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-17T00:00:00","Finished":"2022-04-18T00:00:00"},{"Id":72,"AgileSprintModelId":5,"Name":"Calculations Change Answers Over Time","Description":"Obviously a bug in the calculation logic","Notes":"addNotes","Status":"Done","Priority":"High","Task":"Bug","OrderPriority":3,"Created":"2022-04-17T00:00:00","Finished":"2022-04-18T00:00:00"}]
\ No newline at end of file
diff --git a/IGP_Convert/IGP_Convert.csproj b/IGP_Convert/IGP_Convert.csproj
index ac2325f..20cca08 100644
--- a/IGP_Convert/IGP_Convert.csproj
+++ b/IGP_Convert/IGP_Convert.csproj
@@ -8,18 +8,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Contexts\Contexts.csproj"/>
-        <ProjectReference Include="..\Model\Model.csproj"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0-preview.2.22153.1"/>
+        <ProjectReference Include="..\Contexts\Contexts.csproj" />
+        <ProjectReference Include="..\Model\Model.csproj" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0-preview.3.22175.1" />
 
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-preview.2.22153.1"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-preview.2.22153.1">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0-preview.3.22175.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-preview.3.22175.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-preview.2.22153.1"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-preview.2.22153.1"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-preview.2.22153.1">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-preview.3.22175.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-preview.3.22175.1" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-preview.3.22175.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/Model/BuildOrders/TrainingCapacityUsedModel.cs b/Model/BuildOrders/TrainingCapacityUsedModel.cs
index 3e60d73..3ae7343 100644
--- a/Model/BuildOrders/TrainingCapacityUsedModel.cs
+++ b/Model/BuildOrders/TrainingCapacityUsedModel.cs
@@ -4,7 +4,7 @@ namespace Model.BuildOrders;
 
 public class TrainingCapacityUsedModel
 {
-    public int TrainingCapacity { get; set; } = 4;
+    public int UsedSlots { get; set; } = 4;
     public string UsedBuilding { get; set; } = DataType.BUILDING_LegionHall;
     public int StartingUsageTime { get; set; } = 30;
     public int StopUsageTime { get; set; } = 60;
diff --git a/Services/Immortal/BuildOrderService.cs b/Services/Immortal/BuildOrderService.cs
index 70a8a37..6a1a3dc 100644
--- a/Services/Immortal/BuildOrderService.cs
+++ b/Services/Immortal/BuildOrderService.cs
@@ -12,33 +12,33 @@ namespace Services.Immortal;
 
 public class BuildOrderService : IBuildOrderService
 {
-    private readonly BuildOrderModel buildOrder = new();
-    private int lastInterval;
+    private readonly BuildOrderModel _buildOrder = new();
 
-    private readonly IToastService toastService;
+    private readonly IToastService _toastService;
+    private int _lastInterval;
 
     public BuildOrderService(IToastService toastService)
     {
-        this.toastService = toastService;
+        _toastService = toastService;
 
         Reset();
     }
 
     public int BuildingInputDelay { get; set; } = 2;
 
-    public Dictionary<int, List<EntityModel>> StartedOrders => buildOrder.StartedOrders;
-    public Dictionary<int, List<EntityModel>> CompletedOrders => buildOrder.CompletedOrders;
-    public Dictionary<string, int> UniqueCompletedTimes => buildOrder.UniqueCompletedTimes;
-    public Dictionary<int, int> SupplyCountTimes => buildOrder.SupplyCountTimes;
+    public Dictionary<int, List<EntityModel>> StartedOrders => _buildOrder.StartedOrders;
+    public Dictionary<int, List<EntityModel>> CompletedOrders => _buildOrder.CompletedOrders;
+    public Dictionary<string, int> UniqueCompletedTimes => _buildOrder.UniqueCompletedTimes;
+    public Dictionary<int, int> SupplyCountTimes => _buildOrder.SupplyCountTimes;
 
     public int GetLastRequestInterval()
     {
-        return lastInterval;
+        return _lastInterval;
     }
 
     public Dictionary<int, List<EntityModel>> GetOrders()
     {
-        return buildOrder.StartedOrders;
+        return _buildOrder.StartedOrders;
     }
 
     public void Subscribe(Action action)
@@ -54,49 +54,52 @@ public class BuildOrderService : IBuildOrderService
 
     public void Add(EntityModel entity, int atInterval)
     {
-        if (!buildOrder.StartedOrders.ContainsKey(atInterval))
-            buildOrder.StartedOrders.Add(atInterval, new List<EntityModel>());
+        if (!_buildOrder.StartedOrders.ContainsKey(atInterval))
+            _buildOrder.StartedOrders.Add(atInterval, new List<EntityModel>());
 
         var production = entity.Production();
 
         var completedTime = atInterval;
         if (production != null) completedTime += production.BuildTime;
 
-        if (!buildOrder.CompletedOrders.ContainsKey(completedTime))
-            buildOrder.CompletedOrders.Add(completedTime, new List<EntityModel>());
+        if (!_buildOrder.CompletedOrders.ContainsKey(completedTime))
+            _buildOrder.CompletedOrders.Add(completedTime, new List<EntityModel>());
 
-        var supply = entity.Supply();
+        _buildOrder.StartedOrders[atInterval].Add(entity.Clone());
+        _buildOrder.CompletedOrders[completedTime].Add(entity.Clone());
 
+        if (!_buildOrder.UniqueCompletedTimes.ContainsKey(entity.DataType))
+            _buildOrder.UniqueCompletedTimes.Add(entity.DataType, atInterval);
 
-        buildOrder.StartedOrders[atInterval].Add(entity.Clone());
-        buildOrder.CompletedOrders[completedTime].Add(entity.Clone());
+        if (!_buildOrder.UniqueCompletedCount.ContainsKey(entity.DataType))
+            _buildOrder.UniqueCompletedCount.Add(entity.DataType, 1);
+        else
+            _buildOrder.UniqueCompletedCount[entity.DataType]++;
 
-        if (!buildOrder.UniqueCompletedTimes.ContainsKey(entity.DataType))
-            buildOrder.UniqueCompletedTimes.Add(entity.DataType, atInterval);
+        if (!_buildOrder.UniqueCompleted.ContainsKey(entity.DataType))
+            _buildOrder.UniqueCompleted.Add(entity.DataType, new Dictionary<int, List<EntityModel>>());
 
-        if (!buildOrder.UniqueCompletedCount.ContainsKey(entity.DataType))
-            buildOrder.UniqueCompletedCount.Add(entity.DataType, 1);
-        else
-            buildOrder.UniqueCompletedCount[entity.DataType]++;
+        if (!_buildOrder.UniqueCompleted[entity.DataType].ContainsKey(completedTime))
+            _buildOrder.UniqueCompleted[entity.DataType].Add(completedTime, new List<EntityModel>());
 
-        //entity.
-        if (!buildOrder.UniqueCompleted.ContainsKey(entity.DataType))
-            buildOrder.UniqueCompleted.Add(entity.DataType, new Dictionary<int, List<EntityModel>>());
+        if (entity.Production()?.ProducedBy != null)
+            _buildOrder.TrainingCapacityUsed.Add(new TrainingCapacityUsedModel
+            {
+                StartingUsageTime = atInterval,
+                StopUsageTime = completedTime,
+                UsedSlots = entity.Supply() != null ? entity.Supply()!.Takes : 1,
+                UsedBuilding = entity.Production()!.ProducedBy
+            });
 
-        if (!buildOrder.UniqueCompleted[entity.DataType].ContainsKey(completedTime))
-            buildOrder.UniqueCompleted[entity.DataType].Add(completedTime, new List<EntityModel>());
-        
-        buildOrder.UniqueCompleted[entity.DataType][completedTime].Add(entity);
-        
+        _buildOrder.UniqueCompleted[entity.DataType][completedTime].Add(entity);
 
-        if (supply != null)
-        {
-            if (!supply.Takes.Equals(0)) buildOrder.CurrentSupplyUsed += supply.Takes;
-            if (!supply.Grants.Equals(0))
-                buildOrder.SupplyCountTimes.Add(buildOrder.SupplyCountTimes.Last().Key + supply.Grants, completedTime);
-        }
+        if (entity.Supply() != null && entity.Supply()!.Takes > 0)
+            _buildOrder.CurrentSupplyUsed += entity.Supply()!.Takes;
+        if (entity.Supply() != null && entity.Supply()!.Grants > 0)
+            _buildOrder.SupplyCountTimes.Add(_buildOrder.SupplyCountTimes.Last().Key + entity.Supply()!.Grants,
+                completedTime);
 
-        if (atInterval > lastInterval) lastInterval = atInterval;
+        if (atInterval > _lastInterval) _lastInterval = atInterval;
 
         NotifyDataChanged();
     }
@@ -105,17 +108,18 @@ public class BuildOrderService : IBuildOrderService
     {
         if (forInterval < 0)
         {
-            toastService.AddToast(new ToastModel(){SeverityType = SeverityType.Error, Title = "Wait", Message = "This should never happen."});
+            _toastService.AddToast(new ToastModel
+                { SeverityType = SeverityType.Error, Title = "Wait", Message = "This should never happen." });
             return false;
-        };
+        }
 
-        lastInterval += forInterval;
+        _lastInterval += forInterval;
 
-        if (!buildOrder.StartedOrders.ContainsKey(lastInterval))
-            buildOrder.StartedOrders.Add(lastInterval, new List<EntityModel>());
+        if (!_buildOrder.StartedOrders.ContainsKey(_lastInterval))
+            _buildOrder.StartedOrders.Add(_lastInterval, new List<EntityModel>());
 
-        if (!buildOrder.CompletedOrders.ContainsKey(lastInterval))
-            buildOrder.CompletedOrders.Add(lastInterval, new List<EntityModel>());
+        if (!_buildOrder.CompletedOrders.ContainsKey(_lastInterval))
+            _buildOrder.CompletedOrders.Add(_lastInterval, new List<EntityModel>());
 
         NotifyDataChanged();
         return true;
@@ -123,19 +127,23 @@ public class BuildOrderService : IBuildOrderService
 
     public bool AddWaitTo(int interval)
     {
-        if (interval <= lastInterval)
+        if (interval <= _lastInterval)
         {
-            toastService.AddToast(new ToastModel(){SeverityType = SeverityType.Error, Title = "Logic Error", Message = "You cannot wait to a time that has already elapsed."});
+            _toastService.AddToast(new ToastModel
+            {
+                SeverityType = SeverityType.Error, Title = "Logic Error",
+                Message = "You cannot wait to a time that has already elapsed."
+            });
             return false;
         }
 
-        lastInterval = interval;
-        
-        if (!buildOrder.StartedOrders.ContainsKey(lastInterval))
-            buildOrder.StartedOrders.Add(lastInterval, new List<EntityModel>());
+        _lastInterval = interval;
+
+        if (!_buildOrder.StartedOrders.ContainsKey(_lastInterval))
+            _buildOrder.StartedOrders.Add(_lastInterval, new List<EntityModel>());
 
-        if (!buildOrder.CompletedOrders.ContainsKey(lastInterval))
-            buildOrder.CompletedOrders.Add(lastInterval, new List<EntityModel>());
+        if (!_buildOrder.CompletedOrders.ContainsKey(_lastInterval))
+            _buildOrder.CompletedOrders.Add(_lastInterval, new List<EntityModel>());
 
         NotifyDataChanged();
         return true;
@@ -149,7 +157,7 @@ public class BuildOrderService : IBuildOrderService
 
         var metTime = 0;
         foreach (var requiredEntity in requirements)
-            if (buildOrder.UniqueCompletedTimes.TryGetValue(requiredEntity.Id, out var completedTime))
+            if (_buildOrder.UniqueCompletedTimes.TryGetValue(requiredEntity.Id, out var completedTime))
             {
                 if (completedTime > metTime) metTime = completedTime;
             }
@@ -167,8 +175,8 @@ public class BuildOrderService : IBuildOrderService
 
         if (supply == null || supply.Takes.Equals(0)) return 0;
 
-        foreach (var supplyAtTime in buildOrder.SupplyCountTimes)
-            if (supply.Takes + buildOrder.CurrentSupplyUsed < supplyAtTime.Key)
+        foreach (var supplyAtTime in _buildOrder.SupplyCountTimes)
+            if (supply.Takes + _buildOrder.CurrentSupplyUsed <= supplyAtTime.Key)
                 return supplyAtTime.Value;
 
         return null;
@@ -177,7 +185,7 @@ public class BuildOrderService : IBuildOrderService
 
     public bool Add(EntityModel entity, IEconomyService withEconomy)
     {
-        var atInterval = lastInterval;
+        var atInterval = _lastInterval;
 
         if (!HandleSupply(entity, ref atInterval)) return false;
         if (!HandleRequirements(entity, ref atInterval)) return false;
@@ -190,47 +198,47 @@ public class BuildOrderService : IBuildOrderService
 
     public void RemoveLast()
     {
-        if (buildOrder.StartedOrders.Keys.Count > 1)
+        if (_buildOrder.StartedOrders.Keys.Count > 1)
         {
-            if (buildOrder.StartedOrders.Count == 0)
+            if (_buildOrder.StartedOrders.Count == 0)
             {
-                buildOrder.StartedOrders.Remove(buildOrder.StartedOrders.Last().Key);
-                buildOrder.CompletedOrders.Remove(buildOrder.CompletedOrders.Last().Key);
+                _buildOrder.StartedOrders.Remove(_buildOrder.StartedOrders.Last().Key);
+                _buildOrder.CompletedOrders.Remove(_buildOrder.CompletedOrders.Last().Key);
 
-                lastInterval = buildOrder.StartedOrders.Last().Key;
+                _lastInterval = _buildOrder.StartedOrders.Last().Key;
                 return;
             }
 
-            var lastStarted = buildOrder.StartedOrders.Keys.Last();
-            var lastCompleted = buildOrder.CompletedOrders.Keys.Last();
+            var lastStarted = _buildOrder.StartedOrders.Keys.Last();
+            var lastCompleted = _buildOrder.CompletedOrders.Keys.Last();
 
             EntityModel entityRemoved = default!;
 
-            if (buildOrder.StartedOrders[lastStarted].Count > 0)
+            if (_buildOrder.StartedOrders[lastStarted].Count > 0)
             {
-                entityRemoved = buildOrder.StartedOrders[lastStarted].Last();
-                buildOrder.StartedOrders[lastStarted].Remove(buildOrder.StartedOrders[lastStarted].Last());
-                buildOrder.CompletedOrders[lastCompleted].Remove(buildOrder.CompletedOrders[lastCompleted].Last());
+                entityRemoved = _buildOrder.StartedOrders[lastStarted].Last();
+                _buildOrder.StartedOrders[lastStarted].Remove(_buildOrder.StartedOrders[lastStarted].Last());
+                _buildOrder.CompletedOrders[lastCompleted].Remove(_buildOrder.CompletedOrders[lastCompleted].Last());
             }
 
-            if (buildOrder.StartedOrders[lastStarted].Count == 0) buildOrder.StartedOrders.Remove(lastStarted);
-            if (buildOrder.CompletedOrders[lastCompleted].Count == 0) buildOrder.CompletedOrders.Remove(lastCompleted);
+            if (_buildOrder.StartedOrders[lastStarted].Count == 0) _buildOrder.StartedOrders.Remove(lastStarted);
+            if (_buildOrder.CompletedOrders[lastCompleted].Count == 0)
+                _buildOrder.CompletedOrders.Remove(lastCompleted);
 
-            if (buildOrder.StartedOrders.Keys.Count > 0)
-                lastInterval = buildOrder.StartedOrders.Keys.Last();
+            if (_buildOrder.StartedOrders.Keys.Count > 0)
+                _lastInterval = _buildOrder.StartedOrders.Keys.Last();
             else
-                lastInterval = 0;
+                _lastInterval = 0;
 
             if (entityRemoved.Supply()?.Grants > 0)
                 SupplyCountTimes.Remove(SupplyCountTimes.Last().Key);
 
             if (entityRemoved.Supply()?.Takes > 0)
-                buildOrder.CurrentSupplyUsed -= entityRemoved.Supply()!.Takes;
-            
-            
+                _buildOrder.CurrentSupplyUsed -= entityRemoved.Supply()!.Takes;
 
-            buildOrder.UniqueCompletedCount[entityRemoved!.DataType]--;
-            if (buildOrder.UniqueCompletedCount[entityRemoved!.DataType] == 0)
+
+            _buildOrder.UniqueCompletedCount[entityRemoved!.DataType]--;
+            if (_buildOrder.UniqueCompletedCount[entityRemoved!.DataType] == 0)
                 UniqueCompletedTimes.Remove(entityRemoved.DataType);
 
             if (entityRemoved.Info().Descriptive == DescriptiveType.Worker)
@@ -251,14 +259,14 @@ public class BuildOrderService : IBuildOrderService
             WriteIndented = true
         };
         options.Converters.Add(new JsonStringEnumConverter());
-        return JsonSerializer.Serialize(buildOrder, options);
+        return JsonSerializer.Serialize(_buildOrder, options);
     }
 
     public string BuildOrderAsYaml()
     {
         var stringBuilder = new StringBuilder();
         var serializer = new Serializer();
-        stringBuilder.AppendLine(serializer.Serialize(buildOrder));
+        stringBuilder.AppendLine(serializer.Serialize(_buildOrder));
         var buildOrderText = stringBuilder.ToString();
         return buildOrderText;
     }
@@ -266,7 +274,7 @@ public class BuildOrderService : IBuildOrderService
 
     public List<EntityModel> GetCompletedBefore(int interval)
     {
-        return (from ordersAtTime in buildOrder.StartedOrders
+        return (from ordersAtTime in _buildOrder.StartedOrders
             from orders in ordersAtTime.Value
             where ordersAtTime.Key + (orders.Production() == null ? 0 : orders.Production().BuildTime) <= interval
             select orders).ToList();
@@ -274,7 +282,7 @@ public class BuildOrderService : IBuildOrderService
 
     public List<EntityModel> GetHarvestPointsCompletedBefore(int interval)
     {
-        return (from ordersAtTime in buildOrder.StartedOrders
+        return (from ordersAtTime in _buildOrder.StartedOrders
             from orders in ordersAtTime.Value
             where ordersAtTime.Key + (orders.Production() == null ? 0 : orders.Production().BuildTime) <= interval
             where orders.Harvest() != null
@@ -284,24 +292,24 @@ public class BuildOrderService : IBuildOrderService
 
     public void SetName(string name)
     {
-        buildOrder.Name = name;
+        _buildOrder.Name = name;
         NotifyDataChanged();
     }
 
     public string GetName()
     {
-        return buildOrder.Name;
+        return _buildOrder.Name;
     }
 
     public void SetNotes(string notes)
     {
-        buildOrder.Notes = notes;
+        _buildOrder.Notes = notes;
         NotifyDataChanged();
     }
 
     public string GetNotes()
     {
-        return buildOrder.Notes;
+        return _buildOrder.Notes;
     }
 
     public void DeprecatedSetColor(string color)
@@ -315,37 +323,39 @@ public class BuildOrderService : IBuildOrderService
 
     public void Reset()
     {
-        lastInterval = 0;
-        buildOrder.Initialize(DataType.FACTION_Aru);
+        _lastInterval = 0;
+        _buildOrder.Initialize(DataType.FACTION_Aru);
         NotifyDataChanged();
     }
 
-    public bool AddWaitTo(int interval, TimingService timingService)
-    {
-        if (lastInterval >= interval) return false;
-
-        if (interval > timingService.GetAttackTime()) return false;
-
-
-        if (!buildOrder.StartedOrders.ContainsKey(lastInterval))
-            buildOrder.StartedOrders.Add(lastInterval, new List<EntityModel>());
-
-        if (!buildOrder.CompletedOrders.ContainsKey(lastInterval))
-            buildOrder.CompletedOrders.Add(lastInterval, new List<EntityModel>());
-
-        NotifyDataChanged();
-        return true;
-    }
-
     public int? WillMeetTrainingQueue(EntityModel entity)
     {
         var supply = entity.Supply();
+        var production = entity.Production();
+        if (supply == null || production == null || supply.Takes.Equals(0)) return 1;
 
-        if (supply == null || supply.Takes.Equals(0)) return 0;
+        var producedBy = production.ProducedBy;
+        if (producedBy == null)
+            return 1;
 
+        var uniqueCompleted = _buildOrder.UniqueCompleted[producedBy];
+
+
+        foreach (var used in _buildOrder.TrainingCapacityUsed)
+        {
+            //used.UsedBuilding
+        }
+        
+        foreach (var atTime in uniqueCompleted)
+        {
+            foreach (var productionEntity in uniqueCompleted[atTime.Key])
+            {
+                
+            }
+        }
 
-        foreach (var supplyAtTime in buildOrder.SupplyCountTimes)
-            if (supply.Takes + buildOrder.CurrentSupplyUsed < supplyAtTime.Key)
+        foreach (var supplyAtTime in _buildOrder.SupplyCountTimes)
+            if (supply.Takes + _buildOrder.CurrentSupplyUsed < supplyAtTime.Key)
                 return supplyAtTime.Value;
 
         return null;
@@ -375,14 +385,14 @@ public class BuildOrderService : IBuildOrderService
         }
 
         if (withEconomy.GetOverTime().Last().Ether < production.Ether)
-            toastService.AddToast(new ToastModel
+            _toastService.AddToast(new ToastModel
             {
                 Title = "Not Enough Ether", Message = "Build more ether extractors!",
                 SeverityType = SeverityType.Error
             });
 
         if (withEconomy.GetOverTime().Last().Alloy < production.Alloy)
-            toastService.AddToast(new ToastModel
+            _toastService.AddToast(new ToastModel
             {
                 Title = "Not Enough Alloy", Message = "Build more bases!",
                 SeverityType = SeverityType.Error
@@ -396,7 +406,7 @@ public class BuildOrderService : IBuildOrderService
         var minSupplyInterval = WillMeetSupply(entity);
         if (minSupplyInterval == null)
         {
-            toastService.AddToast(new ToastModel
+            _toastService.AddToast(new ToastModel
             {
                 Title = "Supply Cap Reached", Message = "Build more supply!",
                 SeverityType = SeverityType.Error
@@ -415,7 +425,7 @@ public class BuildOrderService : IBuildOrderService
         var minSupplyInterval = WillMeetSupply(entity);
         if (minSupplyInterval == null)
         {
-            toastService.AddToast(new ToastModel
+            _toastService.AddToast(new ToastModel
             {
                 Title = "Supply Cap Reached", Message = "Build more supply!",
                 SeverityType = SeverityType.Error
@@ -435,7 +445,7 @@ public class BuildOrderService : IBuildOrderService
         var minRequirementInterval = WillMeetRequirements(entity);
         if (minRequirementInterval == null)
         {
-            toastService.AddToast(new ToastModel
+            _toastService.AddToast(new ToastModel
             {
                 Title = "Missing Requirements", Message = "You don't have what's needed for this unit.",
                 SeverityType = SeverityType.Error